Merge branch 'maint'
commitb2fde01c545286bb92f6194603817602bf9dfbe7
authorDan McGee <dan@archlinux.org>
Sun, 20 Mar 2011 16:49:42 +0000 (20 11:49 -0500)
committerDan McGee <dan@archlinux.org>
Sun, 20 Mar 2011 16:49:42 +0000 (20 11:49 -0500)
tree283d93f361b09fa5479bc28db6e649e3732884f7
parent524b3389746f3ea44042050ba28b975b65e931ad
parent67c0e9cab39a536f1ca2fbf2a35fe898e3b71ef4
Merge branch 'maint'