From: Rod Whitby <rod@whitby.id.au>
Date: Wed, 26 Dec 2007 11:14:36 +0000 (+0000)
Subject: merge of '44926b8def1aa09fa2284a3f5e6caffacb77ede9'
X-Git-Tag: Release-2010-05/1~8080^2~5^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=90de004a3366386989a6e3d828a693b5bedc62c7;p=openembedded.git

Merge ... '44926b8def1aa09fa2284a3f5e6caffacb77ede9'
     and '8f4f4a96be49747ae2c3c51e51854655b4fc65b6'
---

90de004a3366386989a6e3d828a693b5bedc62c7