merge of '99187c0da3a302acfa7fa4f93194f5f358f40d92'
authorMichael Lauer <mickey@vanille-media.de>
Mon, 1 Sep 2008 18:06:23 +0000 (18:06 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Mon, 1 Sep 2008 18:06:23 +0000 (18:06 +0000)
commita2034d65b71cc8c6ff7b3fb15f3991b45c799ea3
tree5ec74f206dd9e151453aa5bed4708eab2757c100
parent2bad67782e38ad0dc2f27a956dbb933ae4bbd32c
parent282080022fd318c6239f9723e789be33655fe056
Merge ... '99187c0da3a302acfa7fa4f93194f5f358f40d92'
     and 'bfe16c15aa0c506913d70d09dc1dc9fcd8fabf94'