From: Koen Kooi <koen@openembedded.org>
Date: Thu, 21 Dec 2006 17:35:10 +0000 (+0000)
Subject: merge of '3dbb1098a936a64f470f96db6fb6810f8b872d3b'
X-Git-Tag: Release-2010-05/1~9453^2~133
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9f749a2afa6cc3a600eab31fa10176740c9b0690;p=openembedded.git

Merge ... '3dbb1098a936a64f470f96db6fb6810f8b872d3b'
     and 'a083f4b0be32b70cc5c23132ddad82240c468721'
---

9f749a2afa6cc3a600eab31fa10176740c9b0690