merge of '73a0fd7a86c83ccf1f4ef3268b3d5af71f74a60a'
authorKoen Kooi <koen@openembedded.org>
Sun, 13 Aug 2006 10:38:21 +0000 (10:38 +0000)
committerKoen Kooi <koen@openembedded.org>
Sun, 13 Aug 2006 10:38:21 +0000 (10:38 +0000)
     and 'cca0d62f63238636b31f2f73cf7d30fce2b62e84'


Trivial merge