merge of 1b045e2618ad7f952f27e25154f22e90e12f88e0
authorRod Whitby <rod@whitby.id.au>
Tue, 11 Apr 2006 04:38:01 +0000 (04:38 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 11 Apr 2006 04:38:01 +0000 (04:38 +0000)
commit3b3f3f4da734d0f86331f1469c6c391dbda1368c
tree5224687031581c769118463f0aeb1dbaee70c0b1
parent3009647bfa35f761ad5a43f5327abe1c96c5e710
parent0a6048ee45a7cca833c37b07c458f7fa0f28dd79
merge of 1b045e2618ad7f952f27e25154f22e90e12f88e0
     and ec65eb2425626b59f384f8ab081929e9a4f8c5b4