merge of 83195d46f6bf1906b76383eda46dabd7b3f07787
authorKoen Kooi <koen@openembedded.org>
Mon, 15 May 2006 12:57:35 +0000 (12:57 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 15 May 2006 12:57:35 +0000 (12:57 +0000)
commit0560c720075ba3fd361b91e1599ea82c93929ec9
tree309cd72ac7adf63549374ee68b898d8ccd50816d
parent768983d3ad295a7367866b02a907b49e47f1b2e0
parent542db07c0dbdba88cc010333d1a2cec2c153d4d4
merge of 83195d46f6bf1906b76383eda46dabd7b3f07787
     and e6e29b77562355b1ab3fd88dcc282b3158ae5966