From: Rod Whitby <rod@whitby.id.au>
Date: Wed, 17 Aug 2005 14:51:51 +0000 (+0000)
Subject: merge of e248bc9f4ce090838742bfc40304a32cd2d5cdbc
X-Git-Tag: Release-2010-05/1~9453^2~3879^2~9
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5553aaab6fcd6ade569bf7a09c70769f422a8600;p=openembedded.git

merge of e248bc9f4ce090838742bfc40304a32cd2d5cdbc
     and e4a7fdcbb161ebf763444a06c796d9ea126fa9e1
---

5553aaab6fcd6ade569bf7a09c70769f422a8600