merge of '2ae6ecf2677fa2b9a53f45b824b830304af50db8'
authorKoen Kooi <koen@openembedded.org>
Tue, 17 Oct 2006 18:21:16 +0000 (18:21 +0000)
committerKoen Kooi <koen@openembedded.org>
Tue, 17 Oct 2006 18:21:16 +0000 (18:21 +0000)
     and 'ef1738131018813b36ed568f7299f38f6f22f3a2'


Trivial merge