Merge commit 'upstream/0.3.2'
authorMichael Prokop <mika@debian.org>
Mon, 14 Dec 2009 01:53:24 +0000 (02:53 +0100)
committerMichael Prokop <mika@debian.org>
Mon, 14 Dec 2009 01:53:24 +0000 (02:53 +0100)
commitf9ad69dfae6bcec427652b0c4230603e465bd544
treed2a74e92103e637939d9b1cf50fd75fab450f8bc
parenta5ff1a5e17f35b256958ed61a3a026cb8ad011dc
parentbb834fe0ed7a38b724f49b944adb801634eb6194
Merge commit 'upstream/0.3.2'