Merge branch 'master' into master-experimental
authorDidier Raboud <odyx@debian.org>
Mon, 5 Mar 2012 21:55:21 +0000 (22:55 +0100)
committerDidier Raboud <odyx@debian.org>
Mon, 5 Mar 2012 21:55:21 +0000 (22:55 +0100)

Trivial merge