merge of '59db29c2fbf652e798bf9169df311698fabe2566'
authorKoen Kooi <koen@openembedded.org>
Thu, 19 Oct 2006 12:28:37 +0000 (12:28 +0000)
committerKoen Kooi <koen@openembedded.org>
Thu, 19 Oct 2006 12:28:37 +0000 (12:28 +0000)
commita6c420348622f93e723f5c555fde07390a7fe490
tree11b1b4c5d733afbc9f1d2d8d9aa4eca964cb98b3
parent22e4a282d66896496426002f8935186fd7df7085
parentd716bca137a23ad13f0f0a57c7b50a22d25418d5
Merge ... '59db29c2fbf652e798bf9169df311698fabe2566'
     and '78ec88afd42374dfbb8fb0890c47708bbad15959'