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

merge of 7480e1b4a1acb42268fac59998ddedb41c6651a9
     and f1bf6327fe5a564c08a15eb5c9f9cec97d1bedf8
---

226c6e48f2276309029248cf5bb11f8926909466