merge of '50705f6719ea83bd28466a1c4445ea1f3af2dd73'
authorKoen Kooi <koen@openembedded.org>
Mon, 19 Nov 2007 15:17:47 +0000 (15:17 +0000)
committerKoen Kooi <koen@openembedded.org>
Mon, 19 Nov 2007 15:17:47 +0000 (15:17 +0000)
     and 'e278d635280136dca9a2d1d6bce39908402e377f'

1  2 
conf/distro/angstrom-2007.1.conf
conf/distro/angstrom-2008.1.conf

Simple merge
Simple merge