merge of '02c1db88e98d999e6fbb3fda096727c1fc8ad6aa'
authorMichael Lauer <mickey@vanille-media.de>
Fri, 19 Sep 2008 11:17:10 +0000 (11:17 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Fri, 19 Sep 2008 11:17:10 +0000 (11:17 +0000)
commit6a86433f74983c1e91b1436997551e9fb9923f98
tree865558bb27ac89e6b16b3f203264b1f2e80ee0fd
parent607c4c23596699445587f5e365fa9c27ef797afa
parente0baadd5dcb1e0afa5695535dba353e0c2177244
Merge ... '02c1db88e98d999e6fbb3fda096727c1fc8ad6aa'
     and '3a233f347017316b01a5399291d49424a3a4ba9f'