From: Rod Whitby <rod@whitby.id.au>
Date: Fri, 14 Apr 2006 07:52:34 +0000 (+0000)
Subject: merge of 3fed9104364d068f612d6a2a77c80f26f26f3544
X-Git-Tag: Release-2010-05/1~9453^2~1932^2^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=701bb78bdc0ce9a99f83be8691fc3a2e9cfffe1f;p=openembedded.git

merge of 3fed9104364d068f612d6a2a77c80f26f26f3544
     and e0d458573e9c93b608fcceacd5ed347e607b4c2d
---

701bb78bdc0ce9a99f83be8691fc3a2e9cfffe1f