merge of 'e24780d148b92ff2ae1162d9886e4a7befaf60da'
authorMichael Lauer <mickey@vanille-media.de>
Wed, 29 Aug 2007 14:52:10 +0000 (14:52 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Wed, 29 Aug 2007 14:52:10 +0000 (14:52 +0000)
commit3a14317fbe2b23d8ac5a7e4e0bca6ec6c891df20
treed7b6f450045fb5568d2f31008bd117070b7bd3f6
parent2d539e8f1c52a81e7fbaaf9c5f1282aed158b273
parent1230116f8d9c7e4a6c5ee6cdbaf617caa53d0ce9
Merge ... 'e24780d148b92ff2ae1162d9886e4a7befaf60da'
     and 'eb765fb131a4212a65be90317c082f34cd4b4a41'