From: Rod Whitby <rod@whitby.id.au>
Date: Fri, 8 Sep 2006 22:01:16 +0000 (+0000)
Subject: merge of 51907f614e214b34cb5e4bf9b6d09835a6e424d8
X-Git-Tag: Release-2010-05/1~9453^2~876^2~12^2~1^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d729f319961563b8679e569bda82bb45caeb813b;p=openembedded.git

merge of 51907f614e214b34cb5e4bf9b6d09835a6e424d8
     and 600431c30c745c91d5212796f215dab9a6d4864d
---

d729f319961563b8679e569bda82bb45caeb813b