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

merge of 056a776ee239ad24315d1cf23c116ef607815320
     and 232f936c8e8a43979de82996c328acfa35daf9cb
---

1afaa025bd1e467025395bc931f9830c1b125493