Merge remote-tracking branch 'eole/master'
authorgwen <gremond@cadoles.com>
Mon, 23 Jul 2012 13:26:11 +0000 (15:26 +0200)
committergwen <gremond@cadoles.com>
Mon, 23 Jul 2012 13:26:11 +0000 (15:26 +0200)

Trivial merge