merge of 8815d4967f1262fca1f006c351c0008752d95abe
authorGraeme Gregory <dp@xora.org.uk>
Fri, 9 Jun 2006 11:54:49 +0000 (11:54 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 9 Jun 2006 11:54:49 +0000 (11:54 +0000)
     and ece612fcca7a1acdc247d093de2de16137463bae


Trivial merge