Merge master in lamp-mohamadou branch
authorMohamadou Mbengue <mmbengue@gmail.com>
Thu, 19 Apr 2012 07:40:18 +0000 (09:40 +0200)
committerMohamadou Mbengue <mmbengue@gmail.com>
Thu, 19 Apr 2012 07:40:18 +0000 (09:40 +0200)
commitc3fed47a04e016e83528947687254a6c0fc7a60a
treee2a39bc4996f05cf3c189cbbf1d53217cdaadd7a
parent6ec1bf9ae7ad0cf31940bb62af727cc1784591fb
parentc544f9e478d1ec5f35348da99424fe554689ee1b
Merge master in lamp-mohamadou branch