merge of '7eb72993f7971af5ed6ca074f12728e72fab4af9'
authorMichael Lauer <mickey@vanille-media.de>
Mon, 3 Sep 2007 19:35:03 +0000 (19:35 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Mon, 3 Sep 2007 19:35:03 +0000 (19:35 +0000)
commit49001370d6c3f47b2f97ab490136bb7c897eda10
tree9cd5ad94f06838fb895d7e58e6b3d35ab8b63a31
parent87831ee784b33096096766ee3c1e431fffd8119b
parentb277442ca6f4a0648fe5cfdd33b5a6b5f24f55ee
Merge ... '7eb72993f7971af5ed6ca074f12728e72fab4af9'
     and 'b04a5865f2f7f8e22f7323e2a3e613909162c33f'