From: Koen Kooi <koen@openembedded.org>
Date: Tue, 29 Jul 2008 20:30:34 +0000 (+0000)
Subject: merge of 'a94d96e725d7b1b902a9b09b6c9628a3d59d5cf8'
X-Git-Tag: Release-2010-05/1~6438
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8f8ae4bbb78cd7ae5284600b864da3d4d04c1749;p=openembedded.git

Merge ... 'a94d96e725d7b1b902a9b09b6c9628a3d59d5cf8'
     and 'e70bb85147c1884a42eb239c03283cb35fc63033'
---

8f8ae4bbb78cd7ae5284600b864da3d4d04c1749