merge of '3a2d3525d6188443c195ea295aa262c5e3dccb74'
authorKoen Kooi <koen@openembedded.org>
Tue, 14 Oct 2008 10:38:55 +0000 (10:38 +0000)
committerKoen Kooi <koen@openembedded.org>
Tue, 14 Oct 2008 10:38:55 +0000 (10:38 +0000)
     and '40fbbc76fa2b3612027b83b97b4e703d113eaa3c'


Trivial merge