merge of 0a13f5649c4ff4f86d90c76b024acd06c136a588
authorJohn Bowler <jbowler@nslu2-linux.org>
Sun, 14 Aug 2005 20:05:07 +0000 (20:05 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 14 Aug 2005 20:05:07 +0000 (20:05 +0000)
commit1949691f684ae7c0d19a74e19fb37342fa553361
tree44d4c3a8fac1eeda4f7e0d3ba49be4d61ddd53f7
parente977ce6a276892932a2b3961289d51013d404f38
parent30eb4a190fcfb7bd105dda127b7bffc6ccd7fbed
merge of 0a13f5649c4ff4f86d90c76b024acd06c136a588
     and 5da8bfb1d71128589003d0bb6fe70a7a5faeaa0e