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)
commitec4cc21941a1a0d791efe69c5c7fcfb0a14b117d
treea282b4a8899acdc364607a513428cb1bc1d2cf09
parent63b5097099d083e9e9ec8f8e1fd4c9da1e2667c2
parent2d182c562ac4bde9f90c09667046a5f936071ce3
explicit_merge of 85d8528d47a6cf1ff8d3c10b55e327fea4c8262b
              and 3fdd532025257c25f1c852c0042381869d25b9d6
   using ancestor
        to branch 'org.openembedded.nslu2-linux'