merge of 384828c9ac96947ed787099eb14a15f49ebedcac
authorCliff Brake <cbrake@bec-systems.com>
Wed, 5 Jul 2006 16:46:46 +0000 (16:46 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 5 Jul 2006 16:46:46 +0000 (16:46 +0000)
     and b3afec9600880ee22a3041769633491d0f81c427


Trivial merge