merge of '21552d6d6a52b72f70dbeebd78da48da3acf2af8'
authorMichael Lauer <mickey@vanille-media.de>
Tue, 22 Jul 2008 13:36:26 +0000 (13:36 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Tue, 22 Jul 2008 13:36:26 +0000 (13:36 +0000)
commit4d305cbc37c0a3163d82ecdc55927e7bc8d0eaaa
tree78b3760f82430415eef3b87b933c92fe89e7f138
parent648e0bd8693d8e4cd43186db49045622852c310f
parent85bbfb6c7cae9f5d49c97663670c4c5aadc74173
Merge ... '21552d6d6a52b72f70dbeebd78da48da3acf2af8'
     and 'c04c9a166ef26b29f2dd6b75191fb1b7b586a9c6'