explicit_merge of 85d8528d47a6cf1ff8d3c10b55e327fea4c8262b
authorJohn Bowler <jbowler@nslu2-linux.org>
Sun, 7 Aug 2005 21:26:22 +0000 (21:26 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 7 Aug 2005 21:26:22 +0000 (21:26 +0000)
              and 3fdd532025257c25f1c852c0042381869d25b9d6
   using ancestor
        to branch 'org.openembedded.nslu2-linux'


Trivial merge