merge of '7a0881668d38c0d3e64ef7ff7fa74e208b9e2d47'
authorKoen Kooi <koen@openembedded.org>
Mon, 19 Nov 2007 15:17:39 +0000 (15:17 +0000)
committerKoen Kooi <koen@openembedded.org>
Mon, 19 Nov 2007 15:17:39 +0000 (15:17 +0000)
commit517c4f8346f966c6d9f3976955415f38d5d4d38d
tree18e6bb73bbb8922b092cea9fff987970db84aa1d
parent383acfd52cbc12fa8c9994253ba7a8b72515a257
parenteb558e274dca3ca0d7f0f1e2ad3e5ac834530454
Merge ... '7a0881668d38c0d3e64ef7ff7fa74e208b9e2d47'
     and '9e0e042cf0a2ae14b02a20db24de2d6ac3ce71c3'