merge

2012-03-11, laurent