From: Rod Whitby <rod@whitby.id.au>
Date: Mon, 5 Feb 2007 21:30:45 +0000 (+0000)
Subject: merge of '0d2c2ae12399572f307717129530d4a0a9025441'
X-Git-Tag: Release-2010-05/1~9273^2~4^2~1^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3a3d5332f93d650e2bee044ff8ac620124370d02;p=openembedded.git

Merge ... '0d2c2ae12399572f307717129530d4a0a9025441'
     and '9ac2773ad49d5dfb40ed48ebf867fcf938804ff2'
---

3a3d5332f93d650e2bee044ff8ac620124370d02