merge of '56d2135bf97d27ef385220e2f6f36071d007d2c1'
authorKoen Kooi <koen@openembedded.org>
Fri, 19 Sep 2008 08:02:16 +0000 (08:02 +0000)
committerKoen Kooi <koen@openembedded.org>
Fri, 19 Sep 2008 08:02:16 +0000 (08:02 +0000)
     and '93613724e08c89b20a49d8619284f2f1ee5f7898'


Trivial merge