merge of 020407be67cb5ae7c9c858d86887a93ec7831f78
authorKoen Kooi <koen@openembedded.org>
Sun, 8 Jan 2006 00:36:02 +0000 (00:36 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 8 Jan 2006 00:36:02 +0000 (00:36 +0000)
commit9dd0bd811c1e340d8854b19e8f398244e7cc0523
tree7d4eda8d916842a750e0c77e89e9e7f918a4b265
parentaa659825f852872c0c91724212607fb9c519cb30
parent57d37948ea19fcd860cd2f5577e828e126e00a77
merge of 020407be67cb5ae7c9c858d86887a93ec7831f78
     and 76db664e471ff075c7d6410d2cae0e1bdc9b1178