merge of '758d1f4ff547286aef7de856b87ca0bd9f743c4c'
authorKoen Kooi <koen@openembedded.org>
Sat, 6 Sep 2008 22:41:05 +0000 (22:41 +0000)
committerKoen Kooi <koen@openembedded.org>
Sat, 6 Sep 2008 22:41:05 +0000 (22:41 +0000)
commit77d22b463d3fc3982db26d7e8d54ce3df9989077
tree28e210e6a87a9ec65c24c60f49cf135a93705f22
parent58376e87dea829d87f037f1886a049241bccbf3e
parent431dbe0bc08e3c25453135dd52e19b4bed8906ee
Merge ... '758d1f4ff547286aef7de856b87ca0bd9f743c4c'
     and 'ba02b39ad05fe330967acb43ee7ac802b7fd24b3'