merge of 'd03e6ea9b33f8649e0fd60a9e531f435ef2a40ca'
authorKoen Kooi <koen@openembedded.org>
Mon, 19 Mar 2007 15:08:05 +0000 (15:08 +0000)
committerKoen Kooi <koen@openembedded.org>
Mon, 19 Mar 2007 15:08:05 +0000 (15:08 +0000)
     and 'e2140c3f36090f469a27ce291b4786eb114eafce'


Trivial merge