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)
     and '4cd70362c1066d1d95aea3f4308c3007d06592ce'

1  2 
conf/distro/angstrom-2007.1.conf

Simple merge