merge of 94d7300df891d316206c5d2638f48b33f130cdf6
authorRod Whitby <rod@whitby.id.au>
Thu, 8 Dec 2005 07:38:29 +0000 (07:38 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 8 Dec 2005 07:38:29 +0000 (07:38 +0000)
     and b12a6f317d2686fea2fdf958f105aefd8de77146


Trivial merge