merge of 34a4cccc8cdb74f4173031879341a1dcedfc7e31
authorKoen Kooi <koen@openembedded.org>
Thu, 11 May 2006 08:25:03 +0000 (08:25 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 11 May 2006 08:25:03 +0000 (08:25 +0000)
commit7cc33487089ff9a1ff1feaf77f2ea7934207d19c
tree1e4775701cd7524d3256bf203bb5e354990cbed9
parentbe9175725b1da2e5b3c24e648e8bf84e7af8a206
parent3e5fb52e1267b68327c395b5cada0181ac356450
merge of 34a4cccc8cdb74f4173031879341a1dcedfc7e31
     and a9e4bb6b87ea6a9da3a9830289da0aeddb70f467