Merge branch 'master' into diablo-package
authorSteven Luo <steven+maemo@steven676.net>
Sat, 19 Dec 2009 06:09:06 +0000 (22:09 -0800)
committerSteven Luo <steven+maemo@steven676.net>
Sat, 19 Dec 2009 06:09:06 +0000 (22:09 -0800)

Trivial merge