Merge remote branch 'origin/master' old-debian2
authorAndrew Lee (李健秋) <ajqlee@debian.org>
Fri, 11 Jun 2010 21:11:23 +0000 (05:11 +0800)
committerAndrew Lee (李健秋) <ajqlee@debian.org>
Fri, 11 Jun 2010 21:11:23 +0000 (05:11 +0800)

Trivial merge