Merge branch 'maint'
commitc492ca840c54d8d45d5916a280f2119c363e0aba
authorDan McGee <dan@archlinux.org>
Sat, 2 Feb 2008 19:39:50 +0000 (2 13:39 -0600)
committerDan McGee <dan@archlinux.org>
Sat, 2 Feb 2008 19:39:50 +0000 (2 13:39 -0600)
treea0ba13d659fbdf7b316ea75492dcd54b621447b9
parent5647f7f512380200175675bc2fa5fa2e5892d997
parent7cfb343b0fed556e82b6fbc81047c5461effab84
Merge branch 'maint'