#11130# git integration first phase
Merge branch 'release20130102' of github.com:philfree/ofuz into release20130102