merge of '9e9036263aa2cf4c53293c1bd44b54810ab8834f'
authorKoen Kooi <koen@openembedded.org>
Fri, 8 Aug 2008 14:45:23 +0000 (14:45 +0000)
committerKoen Kooi <koen@openembedded.org>
Fri, 8 Aug 2008 14:45:23 +0000 (14:45 +0000)
commit3128542861bfd2b9c06c62a589f7a64aecc23cca
tree11a18d68783bc123f5734e1fae5f0820bb9d4fb6
parente92e271aaf8f2d0c18f52a8ce5f81425e2609804
parent5b7c5937a7994b57fd8401f02b78c47fb274bf42
Merge ... '9e9036263aa2cf4c53293c1bd44b54810ab8834f'
     and 'bfc7cf00ad3b7b17b8c438b23a1b5de36ceef986'