Merge branch 'master' of ../inet

Merge branch 'master' of [email protected]:zarrar/xMIPv6

Merge branch 'master' of [email protected]:inet-framework/inet

git-svn-id: file:///home/rhornig/tmp/svn/inet-framework/trunk@2075 539eec35-cc16-0410-b457-356aab9780e1