merge of '1c44ae3b4aae69a8d66c7c068c44f337bc51f559'
authorMichael Lauer <mickey@vanille-media.de>
Mon, 28 Jan 2008 20:43:08 +0000 (20:43 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Mon, 28 Jan 2008 20:43:08 +0000 (20:43 +0000)
commitd3422da17dbc0353f7ca8e6c8202201b3ff54af2
tree4ebad87462bca8a06ad39538554be5e0fb8b452d
parent8314927eacf95b2f0cb38d4a81ce2b0d555e293d
parentcdd4a5cedce39a419cb8b217770edf5dd7e7f319
Merge ... '1c44ae3b4aae69a8d66c7c068c44f337bc51f559'
     and 'd039068c51d6eb51dd6d0bd1dd1306d490e3d527'