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)
commit33831da957d614e45f01abde50d0c60a94be4508
tree14d3ad70eb143f0ef846d82b9996a9b00d2d7f30
parent04a4703fd77a9698fa8e15986370318e29915233
parent0dff243b4319411d5b2f3598aef3a805d8420c8f
explicit_merge of '8e793ce3712aac86ac8b5ef87d579d56ff6b95dc'
              and 'ae273a2de4c05752a9e1804c5c2809e14b1d568b'
   using ancestor ''
        to branch 'org.openembedded.dev'