From: Rod Whitby <rod@whitby.id.au>
Date: Thu, 13 Apr 2006 13:06:22 +0000 (+0000)
Subject: merge of 868e3092c931e12c4f9d694ad7df1311a37a82fd
X-Git-Tag: Release-2010-05/1~9453^2~1954^2~12^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=77a6f4f731f2b331f03f491ba28c4795555bac32;p=openembedded.git

merge of 868e3092c931e12c4f9d694ad7df1311a37a82fd
     and 4813ca2ee55d62f418589078bde8c65471daf1c4
---

77a6f4f731f2b331f03f491ba28c4795555bac32