Changes merged

2009-12-07, laurent