From: Rod Whitby <rod@whitby.id.au>
Date: Fri, 8 Sep 2006 19:01:31 +0000 (+0000)
Subject: merge of 277f2a83646d0f7a24e0b10b4d24642817d8c5ed
X-Git-Tag: Release-2010-05/1~9453^2~876^2~12^2~1^2~1^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4456d6f71545fe8a4cbfc3b9448186461e4fa0d5;p=openembedded.git

merge of 277f2a83646d0f7a24e0b10b4d24642817d8c5ed
     and 7344e27c160a31398110dcb7d09bd0fc2995fc89
---

4456d6f71545fe8a4cbfc3b9448186461e4fa0d5