Greg changes merged

2009-10-16, 'Laurent Bessard