Merge branch 'master' into diablo-package
authorSteven Luo <steven+maemo@steven676.net>
Fri, 11 Dec 2009 02:18:54 +0000 (18:18 -0800)
committerSteven Luo <steven+maemo@steven676.net>
Fri, 11 Dec 2009 02:18:54 +0000 (18:18 -0800)
commit78273551a663299cf1cc10287d8a35b056954e79
tree488ebd0a2b2755061b40df0f5629c32175648cd9
parent848751e124943562aab29c19fd4b08dc5d06ec2f
parentf2739d4bfd238bc882e34d918ec3bfe26a47fb9d
Merge branch 'master' into diablo-package