merge of 'e18d2142fbd0a6fe86b6cb56dab8ba29dcfa56d6'
authorMichael Lauer <mickey@vanille-media.de>
Sat, 12 Jan 2008 16:11:45 +0000 (16:11 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Sat, 12 Jan 2008 16:11:45 +0000 (16:11 +0000)
commitd100cb85635a4112a0973a2c57d43ef860ce4103
tree7480ea8d52b57d7229c91cfe137d954c56d192ae
parenta654aff11ac98764ad472c3ccabcc6fda2be23eb
parent6c05c351079529c499c8c29121f6d4ec5ca76933
Merge ... 'e18d2142fbd0a6fe86b6cb56dab8ba29dcfa56d6'
     and 'fc9ea88e83e327d8456fd79595597c637950b850'