merge of 942da6c39c03653040af872cf3d01adb58e9743a
authorMike Westerhof <mwester@dls.net>
Wed, 8 Mar 2006 01:15:31 +0000 (01:15 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 8 Mar 2006 01:15:31 +0000 (01:15 +0000)
     and fb01cb6b66688b09ba08a864e91986c7eca65486


Trivial merge