explicit_merge of '911d39563f4bbb32b27acb504168de96ff1e68f7'
authorJohn Bowler <jbowler@nslu2-linux.org>
Sun, 5 Feb 2006 06:36:28 +0000 (06:36 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 5 Feb 2006 06:36:28 +0000 (06:36 +0000)
              and 'd17c8965045bca1d838e85c0b4579217b647682c'
   using ancestor ''
        to branch 'org.openembedded.dev'


Trivial merge