merge of '3f94d65dac6aa5231048ff3e534da903ee56b856'
authorKoen Kooi <koen@openembedded.org>
Tue, 9 Sep 2008 13:15:32 +0000 (13:15 +0000)
committerKoen Kooi <koen@openembedded.org>
Tue, 9 Sep 2008 13:15:32 +0000 (13:15 +0000)
commit0d53f01576fcd2aa4a5d9f8a9020a0da16a1df7a
tree3c24b83ce83c1ff44f353777b3b902cc8ed9e16d
parent9d34b5324ed79e54040b929a0245876a96b00b7e
parenta699f2221e58aac030eb43bb554749f700e253fa
Merge ... '3f94d65dac6aa5231048ff3e534da903ee56b856'
     and 'e1eb2ac7cd166c46d35294a5f5902e7325e8a8c9'