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)
commit608343b79b2001cadb5c3e7902321b02492d0e0e
tree97e0784d5f2ccad69d413a4111eb6a099146daaa
parentc22243da28c363194428c790ca5248c4a6466770
parentf71b8dbf0011cb5c64897109a3433f3b9df54d24
Merge ... 'b27a32bfcc21a1d26ba62f18397b781bbfc0133c'
     and 'c4691d132cd9904569c41d8d59f1a8a1989ddf47'