From: Rod Whitby <rod@whitby.id.au>
Date: Sun, 24 Dec 2006 08:17:01 +0000 (+0000)
Subject: merge of 99ee044261525e1f0b08f49f73d9a39028c8dcc7
X-Git-Tag: Release-2010-05/1~9453^2~27^2~7^2~1^2^2^2~3^2~1^2~1^2^2^2~2^2^2~1^2^2~1^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c39e621790952b3e2835fd056801e4a8b4674485;p=openembedded.git

merge of 99ee044261525e1f0b08f49f73d9a39028c8dcc7
     and ddc1435bf9be5344c25c778b1bc2d6af4d04448b
---

c39e621790952b3e2835fd056801e4a8b4674485