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)

Trivial merge