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)
commit71ce7ab5698d5ba25a4ba7f27cf1b32560054f4c
tree763927435a5d8d5b260304eb0ce800b4c0ad4e9f
parent517c4f8346f966c6d9f3976955415f38d5d4d38d
parentca232b759e5b42183969f926454d493ee072dad1
Merge ... '50705f6719ea83bd28466a1c4445ea1f3af2dd73'
     and 'e278d635280136dca9a2d1d6bce39908402e377f'
conf/distro/angstrom-2007.1.conf
conf/distro/angstrom-2008.1.conf