[SCM] codehaus-parent packaging branch, master, updated. upstream/4-7-g33a6b49

[Timo Aaltonen]

The following commit has been merged in the master branch:
commit 33a6b493f0649f2c2a5251a8182145f028372f7a
Merge: e2b7c8735cfa61ba05452b73547a5d9e2a94c96c 8231465db3249bf2b4ab65fa5138791c67221483
Author: Timo Aaltonen <tjaalton at ubuntu.com>
Date:   Wed Dec 5 09:36:41 2012 +0200

    Merge tag 'upstream/4'
    
    Upstream version 4


-- 
codehaus-parent packaging