From: Koen Kooi <koen@openembedded.org>
Date: Sat, 29 Jul 2006 16:11:31 +0000 (+0000)
Subject: merge of '5488dcb57b02d59ec27d65e068bc0069a4e4c86e'
X-Git-Tag: Release-2010-05/1~9453^2~1062
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2791ba697a8b671e44aa79214672ea1fb5638137;p=openembedded.git

Merge ... '5488dcb57b02d59ec27d65e068bc0069a4e4c86e'
     and 'a3d194bab430424d2cb654ed59d6b0f9f8952f83'
---

2791ba697a8b671e44aa79214672ea1fb5638137