Merge branch 'master' into feature
authorRobin H. Johnson <robbat2@gentoo.org>
Sat, 1 Nov 2008 00:48:26 +0000 (00:48 +0000)
committerRobin H. Johnson <robbat2@gentoo.org>
Sat, 1 Nov 2008 00:48:26 +0000 (00:48 +0000)
commit5ed670ab4f2e3ca58180367c76b06084f3bb37e1
treedd81cf731b6e82828973a4ddda93fe594235b6b3
parenta5c3cfcc65f84e9e616cd4f0657a06f148331b3a
parentac5ab47320777b42104028f19383fdc6fc3aceb7
Merge branch 'master' into feature