From: Rod Whitby <rod@whitby.id.au>
Date: Mon, 1 Jan 2007 18:17:27 +0000 (+0000)
Subject: merge of 5c1ed62467a4b699ec7940179d22e83acf36ad4f
X-Git-Tag: Release-2010-05/1~9453^2~34^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9f9094de71fc15decea442de3aebfdfec3b600ad;p=openembedded.git

merge of 5c1ed62467a4b699ec7940179d22e83acf36ad4f
     and df8798fa87151d8069ac3ca7b3a4dc6108eb4ac5
---

9f9094de71fc15decea442de3aebfdfec3b600ad