Merge branch 'master' into diablo-package
authorSteven Luo <steven+maemo@steven676.net>
Fri, 11 Dec 2009 00:52:21 +0000 (16:52 -0800)
committerSteven Luo <steven+maemo@steven676.net>
Fri, 11 Dec 2009 00:52:21 +0000 (16:52 -0800)
commit848751e124943562aab29c19fd4b08dc5d06ec2f
treee2fc96c68581c6231280783dc7985c2d9a79e02c
parent10bb9f19ad2ce6a5d3de98479de2a909481b1d84
parente0583c53d0edc5239fafc98f11519f6c630769ce
Merge branch 'master' into diablo-package