Merge commit 'upstream/0.2.0'
authorAndrew Lee (李健秋) <ajqlee@debian.org>
Fri, 30 Apr 2010 18:53:04 +0000 (02:53 +0800)
committerAndrew Lee (李健秋) <ajqlee@debian.org>
Fri, 30 Apr 2010 18:53:04 +0000 (02:53 +0800)

Trivial merge