merge of 342833fc535c445a294f2410ec5d5684b77ae37a
authorGraeme Gregory <dp@xora.org.uk>
Fri, 28 Apr 2006 11:51:19 +0000 (11:51 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 28 Apr 2006 11:51:19 +0000 (11:51 +0000)
commit7efd634feeddce682fb5092c4e66920cd045a80c
tree3a269cef9e5870165d860f91912d6831f3fd4bb8
parente71c54154f0be59ea2fcc190fc69d63d5c403671
parentb855703456cd80e90a08f14eaa43e7e46cb8b546
merge of 342833fc535c445a294f2410ec5d5684b77ae37a
     and 6c75ab5216efc0e63263169572f0eac15fd9fa90