explicit_merge of 'd8cdf62120af403fb6e212a637f07ee6bec94b05'
authorJohn Bowler <jbowler@nslu2-linux.org>
Tue, 3 Jan 2006 23:37:06 +0000 (23:37 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 3 Jan 2006 23:37:06 +0000 (23:37 +0000)
              and '11923cb95e906cb69ddced31b2fe3e5a10ab53b0'
   using ancestor ''
        to branch 'org.openembedded.dev'


Trivial merge