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)

Trivial merge