merge of 6ce286acc5aed59832502c3ad006c1d171a4bb5f
authorKoen Kooi <koen@openembedded.org>
Thu, 10 Nov 2005 13:46:05 +0000 (13:46 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 10 Nov 2005 13:46:05 +0000 (13:46 +0000)
commit894b7f2a3c1ab1fd49948ae812010d23520fc554
treeb4f1944438edbeedf760cb08fb1edf68d25f3169
parentfa96cbd76be8b084d7fef1c976dc48dc97d2ca77
parent018196827b5beff6b28f13198dafdf2c4a4f7f7b
merge of 6ce286acc5aed59832502c3ad006c1d171a4bb5f
     and b053e84187fb373b9060e7a8602747ee924da19f