From: Rod Whitby <rod@whitby.id.au>
Date: Sun, 27 Aug 2006 11:01:24 +0000 (+0000)
Subject: merge of f047496cd5580e26d7406d71984e4fa97506c22e
X-Git-Tag: Release-2010-05/1~9453^2~837^2~1^2^2~1^2~3
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=febd511fb542f575754a19bbea93707f0014702c;p=openembedded.git

merge of f047496cd5580e26d7406d71984e4fa97506c22e
     and f31eab98f422e94d72f0504777aadcd812edb52a
---

febd511fb542f575754a19bbea93707f0014702c