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

merge of 1d300011acbbe30e7dc700831a8be86a263d037d
     and 42b92aefcfb63128fe29cccadfb0db2002142758
---

7c049b172b23ef4ca7859fafdf4cc86137ace0be