merge of 0877d014862bebd39f00cd33f5c60eafefbbc306
authorRod Whitby <rod@whitby.id.au>
Wed, 8 Feb 2006 20:16:30 +0000 (20:16 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 8 Feb 2006 20:16:30 +0000 (20:16 +0000)
commitf699ef3604f2af3f321eeaa55d984d9421f83a10
tree06418bd2b6fbce08cc2bf150d0829cc34c639ec7
parentd0436ce94dfa44ff4f566c9778d510cbee7d626b
parentf58b9f0b800a7862e2e58692fa8e249fa1dcbc81
merge of 0877d014862bebd39f00cd33f5c60eafefbbc306
     and 66c4a96409f67476191a2635d4577125b7dafa40