merge of b429c0f1af49e05679400d4ba67f96a25e2b4316
authorJohn Bowler <jbowler@nslu2-linux.org>
Sun, 7 Aug 2005 19:53:15 +0000 (19:53 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 7 Aug 2005 19:53:15 +0000 (19:53 +0000)
commit63b5097099d083e9e9ec8f8e1fd4c9da1e2667c2
tree70c1d1ebdd7e169b74700c2bda8701d639abe257
parentba6f7d73b8aed12409a8229c56fda66914f0b499
parentad00f15597bda01daefa99e1ced2af8cd490cf1f
merge of b429c0f1af49e05679400d4ba67f96a25e2b4316
     and c9a59c1ab8b4309afa4a724e1a72443b01fd97b8