Merge commit 'fdo/master' into debian/unstable
authorRami Ylimäki <rami.ylimaki@vincit.fi>
Mon, 3 Jan 2011 14:26:41 +0000 (16:26 +0200)
committerRami Ylimäki <rami.ylimaki@vincit.fi>
Mon, 3 Jan 2011 14:26:41 +0000 (16:26 +0200)
commit83e40ead3f63031983ffd253e4d2e989a18a1024
treefe69ab0768f7efab0e77be0fe85de2f25a3f9edb
parent9674f7378c337e7c95856d8e4feabfe2785b0ff0
parent3c5813697169a33ecfd6ac0ab5641dec654f6612
Merge commit 'fdo/master' into debian/unstable