merge of '8f5711b8ee04e00c48f5997987d6ab4600e5dc19'
authorMichael Lauer <mickey@vanille-media.de>
Tue, 26 Aug 2008 15:35:52 +0000 (15:35 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Tue, 26 Aug 2008 15:35:52 +0000 (15:35 +0000)
commitde9009f8e9bfdad0343494ba99e3ae4e830fb871
tree698255efa5035f9e055afef359d39154a2392910
parenta46613fd6a2998861272090c62e7d3d7a8b93325
parent6e5e69478c517beaa1c74b947c5043441d9397f5
Merge ... '8f5711b8ee04e00c48f5997987d6ab4600e5dc19'
     and 'b04f946bcf310267d7557532bc06f235d79f8226'