merge of 79d9031e921eb2b64b0a614d28f2952b273cf3cc
authorJamie Lenehan <lenehan@twibble.org>
Fri, 26 May 2006 09:46:47 +0000 (09:46 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 26 May 2006 09:46:47 +0000 (09:46 +0000)
     and 8e49054449c5f82e15664ab6be8b283a79666195


Trivial merge