merge of 858e64537efe69df63da6cafca905f211aa07966
authorRod Whitby <rod@whitby.id.au>
Tue, 8 Nov 2005 16:39:39 +0000 (16:39 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 8 Nov 2005 16:39:39 +0000 (16:39 +0000)
     and c1a4fbc4fa6781b2aaf2fb4c8c767604861616e7


Trivial merge