merge of c6c35eab9b22af441a0f6e66d80fbe9d2816a22c
authorRod Whitby <rod@whitby.id.au>
Mon, 31 Oct 2005 21:02:02 +0000 (21:02 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 31 Oct 2005 21:02:02 +0000 (21:02 +0000)
commit13a395cacb8cd0751f512b6739ccbe84476cb9ea
treed0f2d5050a49b0dc01a6dfafd1b82c799a97ae7d
parentf70f5f73dbdcd84a54857fc4036b73836ac8bb66
parentab425627e2dd784fb6f6d93e15d3483725b7b721
merge of c6c35eab9b22af441a0f6e66d80fbe9d2816a22c
     and c8f0cab0302c6c8cace2907ecc789e1a08db2dc9