pbuilder git tree: Changes to 'master'

[Junichi Uekawa]

 0 files changed

New commits:
commit 6ef6498b80fcbe0e51d8ea433ccc668dacc81666
Merge: 5f9e81fb63dbad9e2c954af93bbe1c0e0de2ac12 66cab2cddc054cf0871e999ca1946db3f2b06ca4
Author: Junichi Uekawa <dancer at netfort.gr.jp>
Date:   Fri Jun 27 18:26:17 2008 +0900

    merge conflict

commit 5f9e81fb63dbad9e2c954af93bbe1c0e0de2ac12
Author: Junichi Uekawa <dancer at netfort.gr.jp>
Date:   Fri Jun 27 15:36:31 2008 +0900

    update japanese po translation.