Merge branch 'pacman-g2'
authorJoey Hess <joey@kodama.kitenet.net>
Fri, 4 Jan 2008 17:04:54 +0000 (12:04 -0500)
committerJoey Hess <joey@kodama.kitenet.net>
Fri, 4 Jan 2008 17:04:54 +0000 (12:04 -0500)

Trivial merge