merge of '223327fd3033fa458005719c617ffb6c13746e86'
authorKoen Kooi <koen@openembedded.org>
Wed, 4 Oct 2006 13:23:00 +0000 (13:23 +0000)
committerKoen Kooi <koen@openembedded.org>
Wed, 4 Oct 2006 13:23:00 +0000 (13:23 +0000)
     and 'ce63e148eb0ac86cb7f827f18f543498d1950b15'


Trivial merge