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)
commit453a550bacf07fc9c63fb18be812e0c2b858571d
tree5ad1a40ef69d794a0c80d13298df24f2c4b8f08d
parent3832388557281f7cd5668d78b0153e4ce2c31c1f
parent2fa7820dd4534557733b068c9f5bfdb235bab7a2
Merge branch 'master' into merge_tmp