20111128-svn6048
Merge branch 'master' of github.com:WeDone/oscam-nx111-cp