merge of '78e920edfcc452a246ac6107c6733947f37cf081'
authorKoen Kooi <koen@openembedded.org>
Fri, 5 Sep 2008 12:07:10 +0000 (12:07 +0000)
committerKoen Kooi <koen@openembedded.org>
Fri, 5 Sep 2008 12:07:10 +0000 (12:07 +0000)
commita515e137db0b7136f3568186cc81dc321dc8d9bc
tree84ae15e952022fd7225037ee00b7d960b540b0cd
parentb982dc7bee8bb4d4e6fc7ba2e27ad438f5347068
parent3f89729beee7989a2787ae842792311542eb1e60
Merge ... '78e920edfcc452a246ac6107c6733947f37cf081'
     and '7f3c3e5a83f5d237147a155da9148a52402e6937'