merge of 44ef2a80f1407b2958e8f750892482362d9bb352
authorRod Whitby <rod@whitby.id.au>
Mon, 28 Nov 2005 20:31:23 +0000 (20:31 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 28 Nov 2005 20:31:23 +0000 (20:31 +0000)
     and d6ed8bd922639d616c17c01d270e9edf2bc6b517


Trivial merge