merge of e24156fa5aa230f0a3328a27650970263b3b3c9f
authorCliff Brake <cbrake@bec-systems.com>
Sat, 8 Jul 2006 20:42:48 +0000 (20:42 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 8 Jul 2006 20:42:48 +0000 (20:42 +0000)
     and fba35ad4edfa08175ea02d3d52147bbcf9f3cfd8


Trivial merge