From: Rod Whitby <rod@whitby.id.au>
Date: Fri, 25 Aug 2006 10:01:07 +0000 (+0000)
Subject: merge of f4fb4cdfa190d470942358aa7731e48626df4a2c
X-Git-Tag: Release-2010-05/1~9453^2~878
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=88bdba6d70a69e84781612060954e2f73ab07b6e;p=openembedded.git

merge of f4fb4cdfa190d470942358aa7731e48626df4a2c
     and ded2a6ac420467a4e7a2e1324eec6ccf1037ab27
---

88bdba6d70a69e84781612060954e2f73ab07b6e