merge of '02c853aa8cfa6c38e9af2ee305306c04ac0a03fa'
authorKoen Kooi <koen@openembedded.org>
Mon, 28 Apr 2008 13:11:24 +0000 (13:11 +0000)
committerKoen Kooi <koen@openembedded.org>
Mon, 28 Apr 2008 13:11:24 +0000 (13:11 +0000)
commitf548461fca3bba7329777be4f89870c6f1cdccc1
tree36beadd61d3627e5d531cfba4faec0866152f121
parentf5f45fe038bec2fecb49bb2ff5dce058ee28de7b
parentf6536f4e827cd982cc390648ddc1ba85f00cc54c
Merge ... '02c853aa8cfa6c38e9af2ee305306c04ac0a03fa'
     and 'e04d9a23468c5cecc2307c456ca0b4b98ad65d50'