merge of '430ec52386873d79595770650004fe72a7a0f620'
authorMichael Lauer <mickey@vanille-media.de>
Tue, 3 Jun 2008 15:10:49 +0000 (15:10 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Tue, 3 Jun 2008 15:10:49 +0000 (15:10 +0000)
commit00094a0bc8cdc287382dcb3a4cb4820fdaca9ff4
tree14332fbbe31e7d4a0d332b82e19af3464452108c
parenta1a099963e810d25281334cdb947c6586d581e29
parent3a3d85f8cd9eb84686a890ebe6d5b3aca49a6dad
Merge ... '430ec52386873d79595770650004fe72a7a0f620'
     and 'e112dc95accddc8f0f59b39818227d3e46468e57'