Merge commit 'upstream/0.2.5'
authorCharles Plessy <plessy@debian.org>
Sat, 7 May 2011 12:17:57 +0000 (21:17 +0900)
committerCharles Plessy <plessy@debian.org>
Sat, 7 May 2011 12:17:57 +0000 (21:17 +0900)
commit6ef84accd7e4c5a48a7a959475bc1e5934e8adeb
treebca5e492b241f6d1b065dff042fc2f9e1d2f1b80
parentfaadd21669e7aa78489b50e70bf4d80417567be4
parentaefb3dc25b66447517ef917ffa68cacd5821cf0d
Merge commit 'upstream/0.2.5'