merge of '34d07eb5a0a81538143c57486cc515538a4d97ea'
authorKoen Kooi <koen@openembedded.org>
Tue, 2 Oct 2007 08:45:48 +0000 (08:45 +0000)
committerKoen Kooi <koen@openembedded.org>
Tue, 2 Oct 2007 08:45:48 +0000 (08:45 +0000)
commitebcb748ed5646052cdd89c14ea09b5ba3768d178
tree14a9eff959c6b82ecbf504a85f06d4ec361f8609
parent80849d56784efbaf1764f05f1ca6a155d04f3b2b
parenta5cc2c34da8c269c29c2ed34409650d0486118a1
Merge ... '34d07eb5a0a81538143c57486cc515538a4d97ea'
     and 'cccbcdee9adebcb074bf6947b2a127fec3260453'