From: Rod Whitby <rod@whitby.id.au>
Date: Mon, 11 Dec 2006 11:17:14 +0000 (+0000)
Subject: merge of 244049db642924c3d41096bbd3e3cc8a4ee881c1
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
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b40116f54b69079d56505f1ddf4363d00ac13a83;p=openembedded.git

merge of 244049db642924c3d41096bbd3e3cc8a4ee881c1
     and 479d306477e9e051b487e61bc544f3b84a98f23e
---

b40116f54b69079d56505f1ddf4363d00ac13a83