From: Rod Whitby <rod@whitby.id.au>
Date: Sun, 10 Dec 2006 21:31:44 +0000 (+0000)
Subject: merge of 014ac97e72d6411c86ebf1062d793df0d1f2781e
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~1^2^2^2^2~6^2~2^2~2^2~1^2~1^2~1^2^2^2^2^2~1^2^2^2^2^2~4^2~2^2~3^2^2~1^2~1^2^2~2^2~4^2^2^2~1^2~2^2~1^2~1^2^2~1^2^2^2^2~6^2^2^2^2~3^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6e7aef109f296b7fc516d3483401e112e06dbae4;p=openembedded.git

merge of 014ac97e72d6411c86ebf1062d793df0d1f2781e
     and c2bcaa2c6b57e1972502fc4e2c689e9ba290f0c9
---

6e7aef109f296b7fc516d3483401e112e06dbae4