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

merge of db90e0deb7a031c29d263ee783179a2f9a00c649
     and a07719feb319fd43615902b86aa7a10c6b61d0ba
---

db96eaf0375c0458ff4d56f24a73d5ce8067940e