[FYI] Merge branch 'maint' into master

[Stefano Lattarini]

commit e251673828b140ebfcabfc520bfe8c20e0f06e4f
Merge: 069d788 d89da9c
Author: Stefano Lattarini <stefano.lattar...@gmail.com>
Date:   Sun May 13 14:10:25 2012 +0200

    Merge branch 'maint'

    * maint:
      tests: fix spurious failure due to i18n issue
      tests: add few missing 'cc' and 'c++' requirements