merge of 'dea5fd7f1b27baf261b5d668733d4ab001554649'
authorKoen Kooi <koen@openembedded.org>
Sun, 13 Jul 2008 13:05:20 +0000 (13:05 +0000)
committerKoen Kooi <koen@openembedded.org>
Sun, 13 Jul 2008 13:05:20 +0000 (13:05 +0000)
commitab2995c706c3c32b2002196d43bbfbecca6707df
tree46ad5ae544745b3575cb16d12969bf6974cc6c16
parente0d701ba170b9da4a9d8b6fbe25d4054c34ec632
parentf4a5a9ebee7381a948c8a34c8d63cbf9dd36912b
Merge ... 'dea5fd7f1b27baf261b5d668733d4ab001554649'
     and 'e0f1f9bc5dd648488bd0c935a9b9ee33a518f15d'