Wed, 13 Jun 2012 19:08:58 +0200Merged Christian Taedcke changes
Edouard Tisserant [Wed, 13 Jun 2012 19:08:58 +0200] rev 739
Merged Christian Taedcke changes

Wed, 13 Jun 2012 19:07:41 +0200Merged Francois BEAULIER's changes
Edouard Tisserant [Wed, 13 Jun 2012 19:07:41 +0200] rev 738
Merged Francois BEAULIER's changes