Merge remote-tracking branch 'allan/breakshit'
commitad577b3cb46dcaf1b143c55324a6eecf9f0ad7f1
authorDan McGee <dan@archlinux.org>
Thu, 30 Jun 2011 15:37:08 +0000 (30 10:37 -0500)
committerDan McGee <dan@archlinux.org>
Thu, 30 Jun 2011 15:37:08 +0000 (30 10:37 -0500)
treed79aa34734791bb069eab172b8ea3e0ee12bedc6
parent0f4aaeee42135d06dd18eb585eab3bae0e5fbf34
parentfed3e09c94d204b4655656c703a178e6fa2144b3
Merge remote-tracking branch 'allan/breakshit'
lib/libalpm/alpm.c
lib/libalpm/util.c