merge of 311aee6b0e9c7e9db57f288fca6db1879c2922e8
authorErik Hovland <erik@hovland.org>
Thu, 25 May 2006 17:58:55 +0000 (17:58 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 25 May 2006 17:58:55 +0000 (17:58 +0000)
     and a7eb3356e7d55322be61cd06888673575122e3b9


Trivial merge