merge of '3e42312311412182ba8645d4302c9621a58bc2a6'
authorMichael Lauer <mickey@vanille-media.de>
Sun, 9 Mar 2008 13:53:05 +0000 (13:53 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Sun, 9 Mar 2008 13:53:05 +0000 (13:53 +0000)
commit6d811306b54b4437df0b60983ab96970ae662ff3
tree0313c04c1c06dacfa7017e55663fa44bd93efc1c
parent487985f75a5104f66c3ca31491aa8d387baff483
parenta4c26ae5208eb5dec1c58c7fd6c32395680e898e
Merge ... '3e42312311412182ba8645d4302c9621a58bc2a6'
     and 'a24d351d91e6596efe9b833b0d983a12bdb3b0ec'