merge of '72dbc16dce7e66fe79d27960cc49c7f53a01d917'
authorFlorian Boor <florian.boor@kernelconcepts.de>
Fri, 19 Oct 2007 17:08:24 +0000 (17:08 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Fri, 19 Oct 2007 17:08:24 +0000 (17:08 +0000)
commit83fc034b292a7969b96bc2f0751682ea4b450778
tree7b787fcd2a51fab0454c08df98cdb51573b054e1
parent905a42d0d7a46f4182e120a558120d8066f1f6cf
parent8847985657a073f785a671b0cdabb6bbdc288db5
Merge ... '72dbc16dce7e66fe79d27960cc49c7f53a01d917'
     and '83cf3f456a3c8033d8c040ae2e89d36ef5a1f05b'