merge of 9b708457afab2c6fe10cebf3363b9e3047e82cdf
authorRod Whitby <rod@whitby.id.au>
Fri, 14 Apr 2006 17:43:18 +0000 (17:43 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 14 Apr 2006 17:43:18 +0000 (17:43 +0000)
     and aa50c5a00e165f90e9a5f70bdf46104508a46fcc


Trivial merge