merge of 1f027d0a7ff2fc1d9e55a283b79111f7c0438568
authorMike Westerhof <mwester@dls.net>
Sat, 25 Mar 2006 21:41:06 +0000 (21:41 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 25 Mar 2006 21:41:06 +0000 (21:41 +0000)
     and e4c846c44328910ba55f411d54a32e47cbc2185b


Trivial merge