Merge commit 'upstream/0.4'
authorCharles Plessy <plessy@debian.org>
Mon, 14 Feb 2011 09:52:56 +0000 (18:52 +0900)
committerCharles Plessy <plessy@debian.org>
Mon, 14 Feb 2011 09:52:56 +0000 (18:52 +0900)
commitd90c1b5ac5adcc9a49de8af978555d6b0ffdeb29
tree37982e38a4dc68e263a677d6fd49155439ada2fd
parentd3b27d0bc1dbe7ccf7facedc6d4d400d68d7e7a6
parent26f0309da73972c169b6e5be6645ba0f1fb072fe
Merge commit 'upstream/0.4'