merge of '069961becc44a86c25703ae2d26de30fba398c72'
authorKoen Kooi <koen@openembedded.org>
Wed, 5 Mar 2008 15:34:09 +0000 (15:34 +0000)
committerKoen Kooi <koen@openembedded.org>
Wed, 5 Mar 2008 15:34:09 +0000 (15:34 +0000)
commit21919ceb5461fd8100c33d8030b4ebd7c046a92d
tree393edcfd357c936f783fbc1d830c735a84fa4a77
parentdea55824a681effd4b0d84a7f194b21606a228a2
parent2fb51c1a7ca0f0336a590095484aaf8643f79032
Merge ... '069961becc44a86c25703ae2d26de30fba398c72'
     and 'e9838ae7ae6df69bb3ed71e9decb1b41fe4f6050'