merge of 3bc4777e54539885e842fcbb48be4faf5b6f0183
authorRod Whitby <rod@whitby.id.au>
Sun, 21 May 2006 07:29:18 +0000 (07:29 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 21 May 2006 07:29:18 +0000 (07:29 +0000)
     and 56a0604f9c781a8ef31f72bb644f11624c80b6e7


Trivial merge