merge of 12b4da6c57d22b540df4a906937d3c7d4fa403fc
authorFrans Meulenbroeks <fransmeulenbroeks@yahoo.com>
Sat, 10 Jun 2006 14:29:55 +0000 (14:29 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 10 Jun 2006 14:29:55 +0000 (14:29 +0000)
     and 9d41fcc4eba0eedc1fb8f754b632607ef08b3b96

1  2 
conf/distro/slugos.conf

Simple merge