K 10 svn:author V 6 marcel K 8 svn:date V 27 2011-11-15T06:35:21.368405Z K 7 svn:log V 121 Bring over all the changes from the altix branch. This is deliberately not a merge, so prevent poisoning the merge data. END