Thu, 09 Feb 2012 20:39:46 +0100Merged with smarteh-dev
Edouard Tisserant [Thu, 09 Feb 2012 20:39:46 +0100] rev 716
Merged with smarteh-dev