merge of '33fdbdf4099643f0cfc674de6234840544695efc'
authorMichael Lauer <mickey@vanille-media.de>
Fri, 3 Oct 2008 11:06:17 +0000 (11:06 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Fri, 3 Oct 2008 11:06:17 +0000 (11:06 +0000)
commitcc4882b8491bdb051f2c8ebf06109af206b33cb8
treec31ff478db60b144e95b38407b41176ba91e3fb9
parentfb9b613fc93b6f6adbd9e5c8087516667e947008
parent7a654187eec4d013b39ae56891b18e47b3e684ae
Merge ... '33fdbdf4099643f0cfc674de6234840544695efc'
     and '8cbbaefc242a3db691387a4cdb4aca694ee0215f'