merge of '243cf387e20ff4eee94397f00dfc3e8dd9273515'
authorKoen Kooi <koen@openembedded.org>
Sat, 16 Jun 2007 14:58:58 +0000 (14:58 +0000)
committerKoen Kooi <koen@openembedded.org>
Sat, 16 Jun 2007 14:58:58 +0000 (14:58 +0000)
commit84251b4fa120f23aade4979f19bd3ffc1620911e
tree55ebd3dbe537b39a3e39c72da54b62b99c4d7837
parentfaeafa1fd7fbd3b6a3a7ed75250a8364f8d4ac94
parent17c5e701a1eb2969aab3bb5f29ada08e3b10544e
Merge ... '243cf387e20ff4eee94397f00dfc3e8dd9273515'
     and '9a35230d2a8469b73580eda5b24e03de17360499'