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

merge of 2a4c7bfbf154708a85c5f3e34620be45b44a137d
     and 589f31431d854bb1374c7e4b776cb2d547feeb8e
---

782609f980b78203c14c1fb14c419d242ba829a2