merge of 'b4ff8a1878072f19f8f3a513f100426adcf08ca1'
authorKoen Kooi <koen@openembedded.org>
Sat, 16 Jun 2007 18:26:51 +0000 (18:26 +0000)
committerKoen Kooi <koen@openembedded.org>
Sat, 16 Jun 2007 18:26:51 +0000 (18:26 +0000)
commit4de7eb1fd29124e895daa1267b97d81c1d0cb1bf
tree64a549f3d41be35d67c4033dacf5c21274c9da54
parent0f1d77c0e3079e868f9e1ff49d45362876a6cc7f
parent595bfc663fd746353f9214b16a041a5bc75a7ff2
Merge ... 'b4ff8a1878072f19f8f3a513f100426adcf08ca1'
     and 'b7a206bd07ea866943577e511b80367c23762c5d'