beremiz

Merge with 35cc4c6a29363d0a89f3e1096832cf14bb79f3de

2009-08-13, edouard
46d7d2ce84d2
Merge with 35cc4c6a29363d0a89f3e1096832cf14bb79f3de