merge of 0c48b57e5d9ae8615d0e0c65bebc171a6b1bcbd1
authorMatt Reimer <mattjreimer@gmail.com>
Fri, 24 Feb 2006 00:07:30 +0000 (00:07 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 24 Feb 2006 00:07:30 +0000 (00:07 +0000)
     and 238b40a012de45582f1cd93b76743b4613edad7b


Trivial merge