Merge remote branch 'fews-portage-branch/pkg_pretend'
authorZac Medico <zmedico@gentoo.org>
Fri, 2 Apr 2010 20:14:14 +0000 (13:14 -0700)
committerZac Medico <zmedico@gentoo.org>
Fri, 2 Apr 2010 20:14:14 +0000 (13:14 -0700)

Trivial merge