merge of 063f5fcd2659dd00fdd34f052bb22a04c2558a5f
authorKoen Kooi <koen@openembedded.org>
Fri, 7 Oct 2005 07:49:42 +0000 (07:49 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 7 Oct 2005 07:49:42 +0000 (07:49 +0000)
commitb9d9dfe52f9fd6209f60aa91c7f3f245f7444b69
tree90c13e9c761154a1333759b2842b3f208baeedc1
parent5c27094d8bb4573126643589cdfa2bc582e56766
parenta1c3254447792031696fe91c3f434e4019399f52
merge of 063f5fcd2659dd00fdd34f052bb22a04c2558a5f
     and 8cb9fe0395955b9160edc9f54e42830aa08e5823