merge of 'c038e0efea1f81ad9c7092f84a3bd377a19e712b'
authorKoen Kooi <koen@openembedded.org>
Tue, 3 Jul 2007 12:09:05 +0000 (12:09 +0000)
committerKoen Kooi <koen@openembedded.org>
Tue, 3 Jul 2007 12:09:05 +0000 (12:09 +0000)
commitb768cec205411f3d370f3a06e1f9a03603f2ad53
treeed268ee3fef8ba284c7e21a351d54aee12eefb9c
parent677ecc4cb5820d2e6fbfba113a8ff335215393c8
parent28dc0d5abba1eede8b5cb32d4135a52399c7bb65
Merge ... 'c038e0efea1f81ad9c7092f84a3bd377a19e712b'
     and 'edcd7cc3ce3933c1022989d2297e120211a6d3fa'