merge of b9b3b3f5835946b0838fa649c358e5f9df8ef861
authorKoen Kooi <koen@openembedded.org>
Fri, 5 May 2006 17:13:42 +0000 (17:13 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 5 May 2006 17:13:42 +0000 (17:13 +0000)
commit41ab47fc3f79ea7ab7473faa9c291d411f8df489
treeeaedae10262e5866505bbc6729045e34d5236d08
parent2d9c1f7655191ea4def26de46d17c8d388abd633
parentb703aeae0906cefdd0fdf5a84ad3da0668758bb6
merge of b9b3b3f5835946b0838fa649c358e5f9df8ef861
     and dbfa3b1481e36f9d201ed1307a587ea91cd36cd2