merge of '60155ceff0e3c21add064d22518f08c6b3c5a304'
authorKoen Kooi <koen@openembedded.org>
Fri, 7 Dec 2007 16:44:04 +0000 (16:44 +0000)
committerKoen Kooi <koen@openembedded.org>
Fri, 7 Dec 2007 16:44:04 +0000 (16:44 +0000)
commit0f76d287853dfed4aa309b8006f756f07e758d0c
tree4d56c4b04d7dc44d10dcaeabd6ac3c695c0a0bc6
parent46c78def93e1fc4adcc4af96aaeda288f8be4d55
parentcc09c532e73687d83e742bb2c51fdb3a7a5319dc
Merge ... '60155ceff0e3c21add064d22518f08c6b3c5a304'
     and 'b0dc261f9674aecabb4a43c73a328aaba4ec338a'