merge of '70c98ecabf04e753c02721c28eb68c90f324d6de'
authorMichael Lauer <mickey@vanille-media.de>
Mon, 22 Oct 2007 16:32:50 +0000 (16:32 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Mon, 22 Oct 2007 16:32:50 +0000 (16:32 +0000)
commitb2f2f00a308c461500ec72b145cde5fc20717700
treeed40bac992e62ff5b524d785147c17cb61f02078
parent76470fec85c94deaddf42a9fbcfe7debd07cf0fa
parentcf444cd1f994325c7f9531506acb0a56074f7ca6
Merge ... '70c98ecabf04e753c02721c28eb68c90f324d6de'
     and 'cebb5151b05a1bb90d6e82d3f2b9883930c5dc35'