merge of '28c6631c48492003a3883657f53019459fbef9c4'
authorKoen Kooi <koen@openembedded.org>
Mon, 14 Aug 2006 13:41:42 +0000 (13:41 +0000)
committerKoen Kooi <koen@openembedded.org>
Mon, 14 Aug 2006 13:41:42 +0000 (13:41 +0000)
     and '755927ccacd770940509d76e9f311b208d090874'


Trivial merge