Merge branch 'master' into experimental/master
authorStephane Glondu <steph@glondu.net>
Wed, 20 Jan 2010 17:33:28 +0000 (18:33 +0100)
committerStephane Glondu <steph@glondu.net>
Wed, 20 Jan 2010 17:33:28 +0000 (18:33 +0100)
commit9141e8526acf3826cdcf75a50bd208b89d920eea
treecc092e7811f84c3c0380e11686aa58e738c94aaf
parentde541bf07c894940924ec85cc78ab2de188189e0
parent86467cd89eb5f337f90cfed336731ed9802b2c6c
Merge branch 'master' into experimental/master

Conflicts:
debian/changelog
debian/changelog