merge of d23a51fd3de55ab7bd14228f1701651fb28530e6
authorMichael Lauer <mickey@vanille-media.de>
Sun, 23 Apr 2006 16:29:33 +0000 (16:29 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 23 Apr 2006 16:29:33 +0000 (16:29 +0000)
     and e399d3faf8861b253531bf4ec2dbec4e5ea1af2b

1  2 
conf/distro/angstrom-2006.9.conf

Simple merge