Merge branch 'master' into local
commita325b9b91e3c6c2186588c80a4171262bd809b9a
authorZhang Le <r0bertz@gentoo.org>
Fri, 13 Mar 2009 16:09:35 +0000 (14 00:09 +0800)
committerZhang Le <r0bertz@gentoo.org>
Fri, 13 Mar 2009 16:09:35 +0000 (14 00:09 +0800)
tree4fb15e0bf125cb3730aa1362263d6fd0e7a7badb
parent329d156cdf4dc870a54c5120461ef534da0339c2
parent81720f4aaf0ebe8827e4c35b09c761ec686d4c67
Merge branch 'master' into local