From: Rod Whitby <rod@whitby.id.au>
Date: Mon, 16 Oct 2006 13:16:15 +0000 (+0000)
Subject: merge of 64153b2d48a859d15b3243a0e2e761097c866ca6
X-Git-Tag: Release-2010-05/1~9453^2~567^2~158^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=363463f9eec73fc21c730986c98fbe267f7eca27;p=openembedded.git

merge of 64153b2d48a859d15b3243a0e2e761097c866ca6
     and c537c01e7d6616ebcada76c38a57714d8994d6e2
---

363463f9eec73fc21c730986c98fbe267f7eca27