merge of 7134dba3d19d7e37fe8d91b2eb4472f07be7a583
authorRod Whitby <rod@whitby.id.au>
Mon, 24 Apr 2006 21:49:48 +0000 (21:49 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 24 Apr 2006 21:49:48 +0000 (21:49 +0000)
     and d8df52a582560aaab0778576a0d57ac53e65acdb


Trivial merge