From: Oyvind Repvik <nail@nslu2-linux.org>
Date: Mon, 27 Feb 2006 15:49:14 +0000 (+0000)
Subject: explicit_merge of '8e793ce3712aac86ac8b5ef87d579d56ff6b95dc'
X-Git-Tag: Release-2010-05/1~9453^2~2304^2~32
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=33831da957d614e45f01abde50d0c60a94be4508;p=openembedded.git

explicit_merge of '8e793ce3712aac86ac8b5ef87d579d56ff6b95dc'
              and 'ae273a2de4c05752a9e1804c5c2809e14b1d568b'
   using ancestor ''
        to branch 'org.openembedded.dev'
---

33831da957d614e45f01abde50d0c60a94be4508