Wed, 16 Jun 2010 21:52:17 +0200merge
laurent [Wed, 16 Jun 2010 21:52:17 +0200] rev 245
merge