From: Graeme Gregory <dp@xora.org.uk>
Date: Mon, 12 Jun 2006 12:32:44 +0000 (+0000)
Subject: merge of 1b2e21b185da17a194d778853f848c2e86a2d31a
X-Git-Tag: Release-2010-05/1~9453^2~1463^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f1ab5d1610175c155e1de6ce40500ced5cdcd83b;p=openembedded.git

merge of 1b2e21b185da17a194d778853f848c2e86a2d31a
     and 649d3cf23ceed3a98c61de4cfc356bb3848b9cf3
---

f1ab5d1610175c155e1de6ce40500ced5cdcd83b