From: Rod Whitby <rod@whitby.id.au>
Date: Wed, 27 Dec 2006 10:47:22 +0000 (+0000)
Subject: merge of 0fcc0eb9ebe0187095f35e237c3bd3a2093a4ef3
X-Git-Tag: Release-2010-05/1~9453^2~27^2~7^2~1^2^2^2~3^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6b4889bacd232c98fec16c930c3b39fb65499e7d;p=openembedded.git

merge of 0fcc0eb9ebe0187095f35e237c3bd3a2093a4ef3
     and 5d3b23f0c6195c7b5918319e8a2676f3c767a0ab
---

6b4889bacd232c98fec16c930c3b39fb65499e7d