merge of '3e3e5c3190f2cb2e6fbed584c5049e73df49c04e'
authorMichael Lauer <mickey@vanille-media.de>
Mon, 21 Jul 2008 22:51:07 +0000 (22:51 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Mon, 21 Jul 2008 22:51:07 +0000 (22:51 +0000)
commitb6ecf118e3a541c4a6ab2abcf9b4a18d40e33469
tree4cb95947aff7dea1d4eef51b1e7284ab20126fcd
parente2251ba07bbb9734905d539ae0e294c08a1ecbde
parent3f1855ad462f58ff1fdcbbfe52240b9375c5ab4c
Merge ... '3e3e5c3190f2cb2e6fbed584c5049e73df49c04e'
     and 'b7c57ac566ade9b73a2dc88a9400d0667d979c84'