merge of '49fb48a813e1e0d599f74dd7a809922ab71939b1'
authorMichael Lauer <mickey@vanille-media.de>
Mon, 3 Dec 2007 19:44:05 +0000 (19:44 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Mon, 3 Dec 2007 19:44:05 +0000 (19:44 +0000)
commit4dc92f941e3afe632a0f08909713a0279ef9d2d5
treefa4f4c3fdf0c926d4e0bcbf1c808b6f13519c9ca
parenta59628bb28f80da4e0e9c1dbd17b851ce4146a17
parent899350269f90ab3a4bd66136b1c351d43683bafd
Merge ... '49fb48a813e1e0d599f74dd7a809922ab71939b1'
     and '6fe2cd0b60b675a1e3118d25934adb4693f3b8ed'