merge of 'aebf88ce897b2503c671d3dd0b5828248df55257'
authorKoen Kooi <koen@openembedded.org>
Mon, 28 Aug 2006 21:00:38 +0000 (21:00 +0000)
committerKoen Kooi <koen@openembedded.org>
Mon, 28 Aug 2006 21:00:38 +0000 (21:00 +0000)
commit6687a609363ae6b96def51668e9cc307b8edd119
tree270f72c579710003395732883986b6b4dd596307
parent8e9d509513711a45f5a6dce57226bf5afaa274c9
parent81b3eb8ab803587093d026de254dd40082913035
Merge ... 'aebf88ce897b2503c671d3dd0b5828248df55257'
     and 'e61f227fe61100734aa43b3a5076a84a40cf3c3d'