merge of '79ea02243e94fe9936f10935156fe8832b208e82'
authorKoen Kooi <koen@openembedded.org>
Sun, 5 Nov 2006 22:29:52 +0000 (22:29 +0000)
committerKoen Kooi <koen@openembedded.org>
Sun, 5 Nov 2006 22:29:52 +0000 (22:29 +0000)
commit6ce67451c7bf9b59f122b164257a9d199d2434cd
treeb9821509e817aebb98c6912b39ea6cf28c99e0d8
parentdf5f57a9830187989177942af891934a604e8e86
parent15a8be5bd4c1e8e422837b579819b1eed1cf2b63
Merge ... '79ea02243e94fe9936f10935156fe8832b208e82'
     and '8bdc2454df92b6e1dd4a83179a268f6e4e9bb972'