From: Rod Whitby <rod@whitby.id.au>
Date: Mon, 1 Aug 2005 00:40:01 +0000 (+0000)
Subject: merge of 391914d150c7b77d69474f4e85a3e0cbba8f5388
X-Git-Tag: Release-2010-05/1~9453^2~3994^2~16^2~4
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6f3b94827bf6c9cef0685aeb305cf1211212f365;p=openembedded.git

merge of 391914d150c7b77d69474f4e85a3e0cbba8f5388
     and f4ec4ad70b55a146c0fe36c3cd2324d495e5e681
---

6f3b94827bf6c9cef0685aeb305cf1211212f365