[SCM] UNNAMED PROJECT branch, master, updated. debian/1.2.1+dfsg-3-12-ge2e666e

[Daigo Moriwaki]

The following commit has been merged in the master branch:
commit 0b181f6b48fada90397418e941c76b58f5e85a8a
Merge: 6e24a9fa8f16475f56e235ec7f1de5d4e82b9cb9 5b7e03cf71990d2b07249c902cb752884c394fa5
Author: Daigo Moriwaki <daigo at debian.org>
Date:   Sun Sep 25 13:09:10 2011 +0900

    Merge branch 'upstream'


-- 
UNNAMED PROJECT