merge of 'f8ad7a4bfb118867c5a5867eb5c4c2c2c74f8330'
authorMichael Lauer <mickey@vanille-media.de>
Sun, 14 Sep 2008 23:05:28 +0000 (23:05 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Sun, 14 Sep 2008 23:05:28 +0000 (23:05 +0000)
commit553cb265aeec877b03a2eeddb9740196e5a4e05c
treedfb1fa7296e7fc8dcfd1c231938ea772b0c3fe27
parentf08288008c2468351c3e3a5d8c3f7177f1cb408b
parent60d19c2a86d4535f10a33a35cedd9c381fb6f592
Merge ... 'f8ad7a4bfb118867c5a5867eb5c4c2c2c74f8330'
     and 'f9d110b5aa39df7718381524083e62d3f8f7a5f0'