merge of 'd49bb94575326116c1e8f8c649730d522f234dae'
authorFlorian Boor <florian.boor@kernelconcepts.de>
Mon, 2 Apr 2007 16:52:13 +0000 (16:52 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Mon, 2 Apr 2007 16:52:13 +0000 (16:52 +0000)
commit165994754ebf7e0c0580ccef01bfb72610652d15
treea8b143916e5371f57c90c259b8717ae21f719720
parentdc507d94349e85086efce828fb614d2a0d79cde9
parentd4f2a045d658aa7fd88b9ccc86a1bf6a3a52ac3d
Merge ... 'd49bb94575326116c1e8f8c649730d522f234dae'
     and 'e4274d99726eb383f5eb120ad5097b8cc4483143'