merge of '1583a0f25533f1163ba206ab1b093a09bc5f17a1'
authorMichael Lauer <mickey@vanille-media.de>
Tue, 3 Jun 2008 11:38:42 +0000 (11:38 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Tue, 3 Jun 2008 11:38:42 +0000 (11:38 +0000)
commit5a3684452649316724b41f4c8ecc4c35175739ee
tree19f8613c80670d124bdf8113a0f20a14566f2562
parent5faf7780f65fa6df1d964606437585e79a1cb1d6
parentb4db5d7f3e1a0470f2111508e2b701acee95055e
Merge ... '1583a0f25533f1163ba206ab1b093a09bc5f17a1'
     and '6c9b3832ef2260eb1b3a74e74b1d73166ab79d89'