Changes merged

2009-12-10, laurent