merge of '217ef203f57a8879dda7852f93f5619e436ee0d0'
authorMichael Lauer <mickey@vanille-media.de>
Sat, 3 May 2008 19:09:09 +0000 (19:09 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Sat, 3 May 2008 19:09:09 +0000 (19:09 +0000)
commit2f0a1dfa7bc08742a457100062f2300fdc6c97b1
treecc3df93c38aa6f269d843b0f8cdd40c4a9812652
parent0e7468a9dd2bea60293b1c124030cc7379de7897
parentda7bf6a829f8f4bd45844493a848613e8a6f8c64
Merge ... '217ef203f57a8879dda7852f93f5619e436ee0d0'
     and '6480750745f57330fa2e1d460a167e9bfac73bae'