merge of 454b45d15e13c588f56710d40bad974b84f2d8ce
authorRod Whitby <rod@whitby.id.au>
Tue, 9 Aug 2005 18:30:46 +0000 (18:30 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 9 Aug 2005 18:30:46 +0000 (18:30 +0000)
     and 69b3134a4a162cdd3e926b6229c0b8bcd01062f9


Trivial merge