merge of '1d191d57e609530bf7d6ccd6705f7e63b0c24231'
authorFlorian Boor <florian.boor@kernelconcepts.de>
Mon, 29 Oct 2007 15:10:38 +0000 (15:10 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Mon, 29 Oct 2007 15:10:38 +0000 (15:10 +0000)
commit8d59b0865a0b9d912f36cef60541e7417163e6e5
tree82d74933f5741e820031e42ad7300b6495b1ffde
parent074e49e9c880aca5f92dd1d20d3108ec051dd7b0
parenteb2fa821b14d23306b10db9ecb5e4b42f12bc20d
Merge ... '1d191d57e609530bf7d6ccd6705f7e63b0c24231'
     and '47227a7d14aad3fad97ac42c0f58256e043f95b7'