From: Rod Whitby <rod@whitby.id.au>
Date: Fri, 13 Jan 2006 17:05:32 +0000 (+0000)
Subject: merge of 69a16876f0ffb0c103caef0590521a09a27ea04f
X-Git-Tag: Release-2010-05/1~9453^2~2659
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=73472a720088f0d9d8703593d20b5f22dda8f17f;p=openembedded.git

merge of 69a16876f0ffb0c103caef0590521a09a27ea04f
     and 727e147b943bf50bd25b6a42f0d8d51dfd7ba82e
---

73472a720088f0d9d8703593d20b5f22dda8f17f