explicit_merge of 'ff8f93bf075f5225452de6de0f7feb3aa1174889'
authorJohn Bowler <jbowler@nslu2-linux.org>
Tue, 3 Jan 2006 21:57:01 +0000 (21:57 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 3 Jan 2006 21:57:01 +0000 (21:57 +0000)
              and 'c47b56a3ef9d7d425411c60ff6fef2a174b20ea6'
   using ancestor ''
        to branch 'org.openembedded.dev'


Trivial merge