merge of 'b27a32bfcc21a1d26ba62f18397b781bbfc0133c'
authorKoen Kooi <koen@openembedded.org>
Mon, 24 Dec 2007 08:26:39 +0000 (08:26 +0000)
committerKoen Kooi <koen@openembedded.org>
Mon, 24 Dec 2007 08:26:39 +0000 (08:26 +0000)
     and 'c4691d132cd9904569c41d8d59f1a8a1989ddf47'


Trivial merge