merge of 68f7b61f8b07129863090b44593b3b470d146473
authorCliff Brake <cbrake@bec-systems.com>
Fri, 16 Jun 2006 18:04:26 +0000 (18:04 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 16 Jun 2006 18:04:26 +0000 (18:04 +0000)
     and d8cfd65d1fa4c05f651452099660ba1d859412a9


Trivial merge