merge of '9ea31290125f045b9aba7f495e83482e68ce640d'
authorMichael Lauer <mickey@vanille-media.de>
Sat, 14 Jun 2008 16:37:42 +0000 (16:37 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Sat, 14 Jun 2008 16:37:42 +0000 (16:37 +0000)
commit1682d5f8e9ada57a3b1e3561c1c56e61a42514bd
tree7beb2dec03281f080528286bfa3b751ad1d5469d
parentdfeedab1ba8c66caf78afe985bab29bfa69a468b
parent2f148387226b979c4ffaa5000320c102f9a4cfb1
Merge ... '9ea31290125f045b9aba7f495e83482e68ce640d'
     and 'c06fa0c45cd1c86ad35d00394ce13105f5d01c08'