Merge branch 'master' into gregoa
authorgregor herrmann <gregoa@debian.org>
Sun, 10 Jan 2010 00:44:25 +0000 (01:44 +0100)
committergregor herrmann <gregoa@debian.org>
Sun, 10 Jan 2010 00:44:25 +0000 (01:44 +0100)
commita757d6e46b25be5ce960bac9275b48959718665c
tree05a6deeb3848c3140c28a188e32c2bd550f78569
parentfbcb293ee35f6593d11e5928cafe8cb3c412524d
parentf3a8152f4191dd0cc854c6a5b6267e07f5af239f
Merge branch 'master' into gregoa