Merged trunk into branch 2.1

git-svn-id: https://svn.typo3.org/TYPO3v4/Extensions/multicolumn/branches/multicolumn_2-1@83461 735d13b6-9817-0410-8766-e36946ffe9aa