merge of '2415386acd7ccac3f0f71353ad8ac290a875573d'
authorKoen Kooi <koen@openembedded.org>
Fri, 8 Jun 2007 08:32:16 +0000 (08:32 +0000)
committerKoen Kooi <koen@openembedded.org>
Fri, 8 Jun 2007 08:32:16 +0000 (08:32 +0000)
commit99080914085100da9cacf91243f0ead3b02abae8
treed0806a6fd48a87ac5116f6e7fa404defb0dfebf1
parente2a93800d6958ce44b0c605f42ce1b04013f4463
parent6e5b132accfc498a843b84477d1aee909068711c
Merge ... '2415386acd7ccac3f0f71353ad8ac290a875573d'
     and '4cd70362c1066d1d95aea3f4308c3007d06592ce'
conf/distro/angstrom-2007.1.conf