Merged devel-framework branch (r5746:5779) back into trunk

thomascube

2012-01-16 c321a955a7b0f6d6b13ffaebf040a6c7091037ae

program/lib/utf7.inc does not exist in tree 60c257d29a726d9bdda7fb75a198342aaef315fa