merge of '00349fdb43ae1a7befdd9ed46ef8b8906eb2ad90'
authorKoen Kooi <koen@openembedded.org>
Fri, 5 Jan 2007 18:33:22 +0000 (18:33 +0000)
committerKoen Kooi <koen@openembedded.org>
Fri, 5 Jan 2007 18:33:22 +0000 (18:33 +0000)
commitbb0050c2af58e22a595457f5360daaae63a899a9
treebfde455142581aa8cc54f075d675088b4fc84d51
parent5bdc794c895e99957ffeaac38182d920b1bbe2c2
parenta9a883008c7b3a7addef1b51d9c56d8ec520e67c
Merge ... '00349fdb43ae1a7befdd9ed46ef8b8906eb2ad90'
     and '6afc7d70704deaac82cc70ddb91183805e3f8802'