From: Rod Whitby <rod@whitby.id.au>
Date: Tue, 19 Dec 2006 19:47:04 +0000 (+0000)
Subject: merge of 893ce9c870a75676f9df8ebc22b0c4d2810882b6
X-Git-Tag: Release-2010-05/1~9453^2~27^2~11^2~2^2^2^2^2~3^2^2^2^2^2~2^2~2^2~6^2^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=56f481e6e144414774f1db7b38008936184c653e;p=openembedded.git

merge of 893ce9c870a75676f9df8ebc22b0c4d2810882b6
     and fd71d3cda2e4aa25eab4f2af7fed042be5034802
---

56f481e6e144414774f1db7b38008936184c653e