merge of '4d6dbbd6409e2a93093659bf415ba3b79f7bc3f6'
authorMichael Lauer <mickey@vanille-media.de>
Tue, 20 May 2008 22:52:14 +0000 (22:52 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Tue, 20 May 2008 22:52:14 +0000 (22:52 +0000)
commit7c915993f17e3e43dcd96e5d1c4ce485963da7d4
tree152d57f14f3804400f77c147796d9f4446910f82
parentd8e3cbb7e1ae86507b7cfd8142be8a1e7323270f
parent5c9f423b3a53df50cb053f3786f75038cab6dd77
Merge ... '4d6dbbd6409e2a93093659bf415ba3b79f7bc3f6'
     and 'b2a4a7fdee4979edfc6a17d3e6ff9a7ffeeb2ab9'