Changes merged

2009-12-16, laurent