merge of '3f5863be74aaf18d9f78fd1e075d3203cc282bdc'
authorMichael Lauer <mickey@vanille-media.de>
Sat, 12 Jan 2008 15:22:59 +0000 (15:22 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Sat, 12 Jan 2008 15:22:59 +0000 (15:22 +0000)
commit3708f93a45a862ad2d104dbb5c864d34876be0c2
tree7de7d2debd4a620e3fd2c424b611126c197b8d36
parent8e7bc75c1a94ae14a1af69fad0cc4e1fbb3f774e
parent3ad50ef778fcdc29cb5fd48109e95d7a8a73fab8
Merge ... '3f5863be74aaf18d9f78fd1e075d3203cc282bdc'
     and 'eaee5612742a446def8bdaaa5b89c3cc8047332e'