merge of 643f20dce93bd762af1d4851da51ff1a73427476
authorRod Whitby <rod@whitby.id.au>
Mon, 5 Dec 2005 18:49:59 +0000 (18:49 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 5 Dec 2005 18:49:59 +0000 (18:49 +0000)
     and 8d84c2b7d68f0db4213acc29ad871140c3dadfd2


Trivial merge