Patch Set 3:

I've done only some quick test on file addition, removing and breakpoints toggling and now everything seams to be working fine ... now I need some sleep before tomorrows travel on ECE ...