merge of 'e6100a99008ef2edc3a6a765cfa14a1dad489cfb'
authorMichael Lauer <mickey@vanille-media.de>
Tue, 16 Oct 2007 15:32:17 +0000 (15:32 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Tue, 16 Oct 2007 15:32:17 +0000 (15:32 +0000)
commitb3ba903379bf59e915d425b1fb4a238b735e0b67
tree59d15780789fba988b75042daf02ed6eb112ef29
parent8d3bc008d4f4389626d8ad4a13c4d80677f3b474
parentcc98c523c185876133323707600c9cc2b004ad2d
Merge ... 'e6100a99008ef2edc3a6a765cfa14a1dad489cfb'
     and 'fd6c3104412672124350e987af3ff8736304f817'