Merge branch 'master' into merge_tmp
authorAndrew Gaffney <agaffney@gentoo.org>
Thu, 3 Sep 2009 01:51:44 +0000 (20:51 -0500)
committerAndrew Gaffney <agaffney@gentoo.org>
Thu, 3 Sep 2009 01:51:44 +0000 (20:51 -0500)

Trivial merge