merge of '2044642e8174795647f8a119435ed8787c7aff99'
authorMichael Lauer <mickey@vanille-media.de>
Mon, 1 Sep 2008 18:12:27 +0000 (18:12 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Mon, 1 Sep 2008 18:12:27 +0000 (18:12 +0000)
commita637f0c537b380165e61755028a26894b58e4f14
tree6ca494dac77dad1d2e496110aa53170a2ccd4120
parent9b9b0aa0ef830ad6a4da5c0681d2a4d557d3dd0c
parenta2034d65b71cc8c6ff7b3fb15f3991b45c799ea3
Merge ... '2044642e8174795647f8a119435ed8787c7aff99'
     and 'cbe3c01bd8b49af467a1371cedad2d5cf2e6654c'