merge of 3efc3491a858b50f5a1a71361f539864b71bae43
authorCliff Brake <cbrake@bec-systems.com>
Sat, 8 Jul 2006 19:10:50 +0000 (19:10 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 8 Jul 2006 19:10:50 +0000 (19:10 +0000)
     and 44feda31605fad4e0b09c7f8c3f7fb125d386297


Trivial merge