r14281 from younes branch

[Lars Gullik Bjønnes]

I belive I have finished the merging of this to trunk now.
Please inform me if you belive I have forgot something.

-- 
        Lgb