From: Rod Whitby <rod@whitby.id.au>
Date: Wed, 27 Dec 2006 21:45:43 +0000 (+0000)
Subject: merge of 5c901b0cb81fef82d2c0bd783dd94551f4d1d244
X-Git-Tag: Release-2010-05/1~9453^2~27^2~7^2~1^2^2^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=542454ae9d48cd09d0b5117ab5a07f8ab2d4ac4e;p=openembedded.git

merge of 5c901b0cb81fef82d2c0bd783dd94551f4d1d244
     and 97e37e0de018f0f2400e67f30a5073cb921b1d18
---

542454ae9d48cd09d0b5117ab5a07f8ab2d4ac4e