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)
commit7e0781dec8f09397329a0c4b7debb687756bdc7d
tree8cbcef12be64c9b14ad8f1602521ec83aff19d0b
parentdb8433c25bb0f52c5c8a1b271f3df6c1ba6598ac
parent0b84a2f8623d594684dd130d3604a76f951c1a55
merge of 8815d4967f1262fca1f006c351c0008752d95abe
     and ece612fcca7a1acdc247d093de2de16137463bae