From: Rod Whitby <rod@whitby.id.au>
Date: Sun, 17 Jul 2005 13:15:49 +0000 (+0000)
Subject: merge of e74c73570c2c682aebf3f9050ed959e4f615d79e
X-Git-Tag: Release-2010-05/1~9453^2~4131^2~3
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=04a269c583bc9586020846c8668d847b5de6095f;p=openembedded.git

merge of e74c73570c2c682aebf3f9050ed959e4f615d79e
     and efd8c005871477b3c2788c1257799459527dd028
---

04a269c583bc9586020846c8668d847b5de6095f