merge of '05c935a7653c0d015e410ba1c92bd8909528d2d0'
authorMichael Lauer <mickey@vanille-media.de>
Tue, 22 Jul 2008 12:50:02 +0000 (12:50 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Tue, 22 Jul 2008 12:50:02 +0000 (12:50 +0000)
commitbe5582e5cd17e6ac56d96c2a9fa1bf7334e4cfca
tree9b2e0e2d964a1856bde2394f24de4bab5839c77b
parentc1fede3c3457ec82550e3ac0e106953db841e2f0
parentb8a968c98e023d5d5f0b6830288853b051fb20cc
Merge ... '05c935a7653c0d015e410ba1c92bd8909528d2d0'
     and '66afa730ae13c8e2f76b43a319e6c5be9e46c981'