merge

2009-12-07, edouard