From: Rod Whitby <rod@whitby.id.au>
Date: Fri, 18 Aug 2006 15:30:58 +0000 (+0000)
Subject: merge of 533f3c268d54f750981ab79951030377d127e31c
X-Git-Tag: Release-2010-05/1~9453^2~878^2~2^2^2^2~2^2^2~1^2~1^2^2~5^2^2^2~2^2^2~5^2^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fb19e4e3b36d7d95c239421898c10f48d8246119;p=openembedded.git

merge of 533f3c268d54f750981ab79951030377d127e31c
     and 99d1863992799e9f29e9132d4320b52a14bd7879
---

fb19e4e3b36d7d95c239421898c10f48d8246119