merge of '02a6624c71727e9ca8fc9cb4497b838837b84379'
authorKoen Kooi <koen@openembedded.org>
Wed, 21 Mar 2007 11:38:35 +0000 (11:38 +0000)
committerKoen Kooi <koen@openembedded.org>
Wed, 21 Mar 2007 11:38:35 +0000 (11:38 +0000)
commit5ae92a6786c33dd187635e9d1674c9195fdf63ec
tree0b2b241d78a14f87b7f84e84e68de8a860a98477
parent7263517b3939ba055d443a0ecbaf5ef9a3e91c38
parent33c2929e38f8a4271be33ab99f41ef861f7e6d22
Merge ... '02a6624c71727e9ca8fc9cb4497b838837b84379'
     and 'fef7c2b78ae5793c1c732ea85c614ee80e04b0e1'