merge of 11d7aceb4fa662251d4850f8057e05439a0a1b10
authorRod Whitby <rod@whitby.id.au>
Wed, 1 Feb 2006 13:00:22 +0000 (13:00 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 1 Feb 2006 13:00:22 +0000 (13:00 +0000)
     and e7435bb445f99b2a8a23053c5faf7ee2326e32d4


Trivial merge