merge of de843404287b36479dc45ace9ce134cef2ab6e93
authorKoen Kooi <koen@openembedded.org>
Sun, 19 Feb 2006 10:28:18 +0000 (10:28 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 19 Feb 2006 10:28:18 +0000 (10:28 +0000)
commitba81094a28b35db729737a391e266c92ecf588e4
tree8ba5f87b4a90cb1e379a828ddab1bb210d0c5aaf
parentdf523bbcf6601a041b801ecceeb2cfd5616fe728
parent205288a508c6677bccf6aa9ba5dc5fef623bbf67
merge of de843404287b36479dc45ace9ce134cef2ab6e93
     and f101befff140631d2a4b3081922d2d30610604cf