From: Rod Whitby <rod@whitby.id.au>
Date: Tue, 19 Dec 2006 11:47:44 +0000 (+0000)
Subject: merge of 55cb79e3cde4287346444fc46cb7dc53a191d5aa
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~4
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=17fb0e1f206d3b5902a0daff505e315f328e2c32;p=openembedded.git

merge of 55cb79e3cde4287346444fc46cb7dc53a191d5aa
     and b1b91c6f4e23fff4113ebe6b978f427acafb1ddb
---

17fb0e1f206d3b5902a0daff505e315f328e2c32