Revision 80407e123d00266fde2bd5cf5ba1d81487864576

Committed on 02/05/2012 1:51 am by Bertrand Dunogier <bd@ez.no> [GitHub Diff]

Merge branch 'stable-1.5'