Merge branch 'master' into local
commit329d156cdf4dc870a54c5120461ef534da0339c2
authorZhang Le <r0bertz@gentoo.org>
Thu, 12 Mar 2009 07:25:55 +0000 (12 15:25 +0800)
committerZhang Le <r0bertz@gentoo.org>
Thu, 12 Mar 2009 07:25:55 +0000 (12 15:25 +0800)
tree11669f751e43ebfb1ab623e4acc0ede3520682d6
parentc54279b257d9b42e0108198f04845359f9979614
parentb28ba3165459935358b22ac366b098aef78f02ab
Merge branch 'master' into local