merge of '83d9cf101f881f4f23bd0c33560c2179b08d8874'
authorFlorian Boor <florian.boor@kernelconcepts.de>
Wed, 11 Jul 2007 11:01:15 +0000 (11:01 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Wed, 11 Jul 2007 11:01:15 +0000 (11:01 +0000)
commit49778d7c8a0027c2920beba40fd42e5705db75b4
tree20bacb907ebb80df985395445a02847310e062c2
parent13e603ff2dc08db74a8ec700375dc494d0a07c24
parent8734f29b172e780435e2c39800241ecc29eee3f7
Merge ... '83d9cf101f881f4f23bd0c33560c2179b08d8874'
     and 'beb1fc79f1a536fd48b5ecbd2bdfcb11369d5888'