Comment 7 for bug 514010

I've finished it, but then i figured out most of my job was for nothing since it includes the logging.debug.
today i had much fewer time, so i didn't finished doing it again..

I'll try this branch later tomorrow morning... (it's 20:00 here)