From: Rod Whitby <rod@whitby.id.au>
Date: Mon, 5 Dec 2005 16:47:28 +0000 (+0000)
Subject: merge of 6217b7556df1e286940ec0d23fad92ab2f91eaa3
X-Git-Tag: Release-2010-05/1~9453^2~2967^2~3^2~2^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=562df0bb4d206422c0e403f5223cd0416f2fadbc;p=openembedded.git

merge of 6217b7556df1e286940ec0d23fad92ab2f91eaa3
     and 9b38a150f49864b478f6d3a1dcf6a63e6d7fa4e8
---

562df0bb4d206422c0e403f5223cd0416f2fadbc