From: Rod Whitby <rod@whitby.id.au>
Date: Tue, 19 Dec 2006 22:48:08 +0000 (+0000)
Subject: merge of 2cb095a37f96f3f076129401bcf32c8ad04a340f
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
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5c2e37c7591dc89c3741c125975282abecf67bab;p=openembedded.git

merge of 2cb095a37f96f3f076129401bcf32c8ad04a340f
     and cacb10c10d8fe6a99c34d2be101b81f4cf57ed70
---

5c2e37c7591dc89c3741c125975282abecf67bab