merge of '19345cff74205f76f6a9f18a8cbd4dd6bb2f4298'
authorMichael Lauer <mickey@vanille-media.de>
Mon, 25 Aug 2008 12:35:41 +0000 (12:35 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Mon, 25 Aug 2008 12:35:41 +0000 (12:35 +0000)
commit64ff4d57e39e9fad1385c00b4665afa5d66c75f3
treead51678b0114a7afc784507cc686efa5a5980fd3
parent170632400a39c176bb6678cfaa63f12c2b28d9ab
parentad284adbc15624a03ffa9d912bcd59d7ac5c4a0a
Merge ... '19345cff74205f76f6a9f18a8cbd4dd6bb2f4298'
     and 'ae7c41d4de5eda76de5c1cb6a2a4fe160fbc9a1d'