merge of 794196dd65f7f3765c599271625175daa1d20cde
authorGraeme Gregory <dp@xora.org.uk>
Wed, 21 Jun 2006 14:13:19 +0000 (14:13 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 21 Jun 2006 14:13:19 +0000 (14:13 +0000)
     and 819d48f7dfdcf5e59b36b88b9b518d8d76d04f06


Trivial merge