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)
commit03764dcdbb25f1c6a62aff5d44f525ef5d27e1d6
tree63dce7963129d0f8431313ae80610183a2ef077b
parentb3ed9847840b077e45c209a342b9d7274e9b3536
parentfaee902e142e72d7a46abc997e81d873c04d5ae0
Merge commit 'upstream/0.2.0'