Merge commit 'upstream/0.3.2'
authorMichael Prokop <mika@debian.org>
Mon, 14 Dec 2009 01:45:47 +0000 (02:45 +0100)
committerMichael Prokop <mika@debian.org>
Mon, 14 Dec 2009 01:45:47 +0000 (02:45 +0100)
commit649939bc87adab5f6ba0d052036b37f70804dfa1
tree92628558a1ca5203ec644b5f80c345b85c12982e
parentac318ae237c0b4281bc745b441bfad38889cf28f
parente3f8e33112e2191999c6d6f6b6a767c72db800a0
Merge commit 'upstream/0.3.2'