Merge branch 'master-new-features'
authorBastien Guerry <bzg@altern.org>
Thu, 31 Jan 2013 11:06:39 +0000 (31 12:06 +0100)
committerBastien Guerry <bzg@altern.org>
Thu, 31 Jan 2013 11:06:39 +0000 (31 12:06 +0100)

Trivial merge