explicit_merge of '93b8d4a095a60dfe2b4b6e82f4ce68721a1d4f11'
authorJohn Bowler <jbowler@nslu2-linux.org>
Mon, 9 Jan 2006 19:21:24 +0000 (19:21 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 9 Jan 2006 19:21:24 +0000 (19:21 +0000)
commit86d1d8cd13335c4dca722ac398c69a105fc9ac8f
treebf7433f99e0fc0ffbdbddd24c2201d21a9dd60e8
parent249a5476b2d2ec15e71b126bb02bc885b29604ee
parent45e1048fb2a2fc047c8a903966ca5cc9d1e03112
explicit_merge of '93b8d4a095a60dfe2b4b6e82f4ce68721a1d4f11'
              and 'd5130c6d17c31fa91dee51b0074c7e5e8c87717c'
   using ancestor ''
        to branch 'org.openembedded.dev'
conf/distro/slugos.conf
conf/machine/nslu2.conf