From: Rod Whitby <rod@whitby.id.au>
Date: Thu, 28 Dec 2006 18:17:17 +0000 (+0000)
Subject: merge of 17fc8adec6d502462c6f0f5c22d99090aa08294d
X-Git-Tag: Release-2010-05/1~9453^2~27^2~7^2~1^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=69efbabc2de31312215ddc7443ede9c30541715b;p=openembedded.git

merge of 17fc8adec6d502462c6f0f5c22d99090aa08294d
     and b71e3dad61b98373edf20e7c3e828b6a864720e2
---

69efbabc2de31312215ddc7443ede9c30541715b