Merge branch 'maint'
commitd201d1f312308b91eff78cb20a148146c3f1188c
authorDan McGee <dan@archlinux.org>
Wed, 15 Sep 2010 12:31:37 +0000 (15 07:31 -0500)
committerDan McGee <dan@archlinux.org>
Wed, 15 Sep 2010 12:31:37 +0000 (15 07:31 -0500)
tree14b6e80d0c93ee61703e9481f7d4abf986c5c325
parent31aed1243ec70632d4e319e67c09446f1a474a6e
parentc2993197ea383aaeb4b0585bfe46235e8c14939d
Merge branch 'maint'