Merge branch 'maint'
commit6b308d89f97340c16e3e805afcc80d70a1c5eebe
authorDan McGee <dan@archlinux.org>
Thu, 5 May 2011 18:25:10 +0000 (5 13:25 -0500)
committerDan McGee <dan@archlinux.org>
Thu, 5 May 2011 18:25:10 +0000 (5 13:25 -0500)
tree3dddd359d462fea54ba75350caa492a93f450a05
parentf2d696cd515ef0365d9708eb3d1caa439e2cc790
parentb14c5477e5e4483352d304a1e97de5922948b934
Merge branch 'maint'
lib/libalpm/be_local.c
lib/libalpm/be_sync.c