merge with forgoten rev

2010-06-01, lolitech