A lot of fix for the merge back to the main 2.0 repo

MoinMoin: ValentinJaniaut/GSoC/Diary/2010-07-17 (last edited 2010-07-19 18:15:19 by ValentinJaniaut)