merge of '34022eff29a839f8a6463586208fafbffd94e083'
authorKoen Kooi <koen@openembedded.org>
Fri, 7 Dec 2007 11:18:18 +0000 (11:18 +0000)
committerKoen Kooi <koen@openembedded.org>
Fri, 7 Dec 2007 11:18:18 +0000 (11:18 +0000)
commit5a563442195a2bdc36911cb173890dbd209895aa
tree9cfad3cfdbbafca55dacf5736aff6bffc2f56080
parent44dbfa499da240ed304f5e7a3b7c5ffe85bcabb7
parent911deca9a4a7865e38bc7cc17e84e04bf4f8d2ff
Merge ... '34022eff29a839f8a6463586208fafbffd94e083'
     and '7444d12b1f1d463507de1ebfd203527718c89cfa'