merge of '6d44b490ec30acc0370a045d7b1eb3eae2b73ab9'
authorFlorian Boor <florian.boor@kernelconcepts.de>
Tue, 15 Jan 2008 11:53:51 +0000 (11:53 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Tue, 15 Jan 2008 11:53:51 +0000 (11:53 +0000)
commitd0ba05d05073b8b452f841c50ef3c7d67c788299
treedcb26069d8aa5b4076c9c5ce6bb2b4e33e05b212
parent405afb504f29cfeaf139558ffbef32d37b435828
parent53437a0c949737295bc9a1799c51f70cd5e21e95
Merge ... '6d44b490ec30acc0370a045d7b1eb3eae2b73ab9'
     and 'e1ff6c067cf71593cf346579bbde3ddb8880cc0c'