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)
commit86c7a226dcf5dbd77f68509c625f8cd78a89e17c
tree574d2e9c4653a170c2a36e98867a1e57a25bc6e3
parentafb6c683b661ab772a70226f76fcf90f137d4a9e
parentde1d2a3d79046f46866116bbb47b5f5b1391938d
merge of 311aee6b0e9c7e9db57f288fca6db1879c2922e8
     and a7eb3356e7d55322be61cd06888673575122e3b9