merge of '192efb6d3bfaa24757749bea21bc0515b1017108'
authorMichael Lauer <mickey@vanille-media.de>
Sun, 5 Aug 2007 06:43:12 +0000 (06:43 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Sun, 5 Aug 2007 06:43:12 +0000 (06:43 +0000)
commit2363582ba077eed1f858893927abfa7d65f78686
treebc25f0cbc5e92c2840da8aee2bab9f2a22d6e417
parent33b0859221ec2b755b1e1f9a69c5d19b0c2d824b
parent7a792e2f3fd515657da9dc0537a6e32a2cc06180
Merge ... '192efb6d3bfaa24757749bea21bc0515b1017108'
     and 'baf87732958baffc539a6e90858e6c2fe5972a1e'