merge of 2eccf1b9297e1bdfb05d568694f7c92afa03eb9e
authorRod Whitby <rod@whitby.id.au>
Mon, 6 Feb 2006 02:46:40 +0000 (02:46 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 6 Feb 2006 02:46:40 +0000 (02:46 +0000)
     and 9fe7f397fe86e4dfdbe20606d124c3211e58b813


Trivial merge