explicit_merge of '8e793ce3712aac86ac8b5ef87d579d56ff6b95dc'
authorOyvind Repvik <nail@nslu2-linux.org>
Mon, 27 Feb 2006 15:49:14 +0000 (15:49 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 27 Feb 2006 15:49:14 +0000 (15:49 +0000)
              and 'ae273a2de4c05752a9e1804c5c2809e14b1d568b'
   using ancestor ''
        to branch 'org.openembedded.dev'


Trivial merge