From: Koen Kooi <koen@openembedded.org>
Date: Tue, 3 Jul 2007 15:57:22 +0000 (+0000)
Subject: merge of '2b438b3f55a45490f30d36bd6006d73826a40b2e'
X-Git-Tag: Release-2010-05/1~8868^2~239
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9a3be9e1943af1c7e54781e5de8d91794d3528bc;p=openembedded.git

Merge ... '2b438b3f55a45490f30d36bd6006d73826a40b2e'
     and '820c91664f0da9157d80383ae442fbebb356aab7'
---

9a3be9e1943af1c7e54781e5de8d91794d3528bc