merge of 406934f50b9f92db47af1cb9d9777b268c5484b5
authorErik Hovland <erik@hovland.org>
Mon, 8 May 2006 18:59:10 +0000 (18:59 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 8 May 2006 18:59:10 +0000 (18:59 +0000)
     and 6ba2bb7b7ce5ef334cf514386df28b8d6a2aad86


Trivial merge