merge of '91d5e4c4066a9c5a157af1cecfa08fa827e70cb1'
authorMichael Lauer <mickey@vanille-media.de>
Tue, 11 Dec 2007 12:42:24 +0000 (12:42 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Tue, 11 Dec 2007 12:42:24 +0000 (12:42 +0000)
commit53a0e5bd875136f23bbc08ae926d2bf9f91ea247
tree904507cae8c2458a1a00b2c2f28678c9256dc4e3
parentb825ea3703438e811a8d55e2bbea5254e3bd6881
parent843ecca5c576542e407919aa719b23ffb89cfc15
Merge ... '91d5e4c4066a9c5a157af1cecfa08fa827e70cb1'
     and 'cb2356de53f19e13c8306f4976bcf0f1b23b36e0'