From: Rod Whitby <rod@whitby.id.au>
Date: Fri, 14 Apr 2006 21:17:19 +0000 (+0000)
Subject: merge of 15a80a372d1017d221f1e725cae0070d170078cb
X-Git-Tag: Release-2010-05/1~9453^2~1904^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=af72986b4e3099aef8678286fb5e498d542a6b13;p=openembedded.git

merge of 15a80a372d1017d221f1e725cae0070d170078cb
     and dbf92f630b3fa1d33d2075e276de7d428f1b8aaa
---

af72986b4e3099aef8678286fb5e498d542a6b13