merge of '32b7fa94caf6c038558548e252b9c813f4bf0891'
authorMichael Lauer <mickey@vanille-media.de>
Sun, 13 Jan 2008 19:06:20 +0000 (19:06 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Sun, 13 Jan 2008 19:06:20 +0000 (19:06 +0000)
commitf01d81718cf3284e2757332a1b8eb3d5c60cf4f7
tree3856bb934bbdfb115b2e70f25263871baf250d21
parentc951cce8e94630d41ce362cdfc1fecea24066325
parent2747463162e993541b0efbea7de936d6a47e8826
Merge ... '32b7fa94caf6c038558548e252b9c813f4bf0891'
     and '51afccca79d0092ea2860950ddbfa96d1c141bb1'