From: Koen Kooi <koen@openembedded.org>
Date: Mon, 31 Jul 2006 16:56:20 +0000 (+0000)
Subject: merge of '355262927125dc01051bf0f6b36fc492b766c9d7'
X-Git-Tag: Release-2010-05/1~9453^2~1037
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3da9a257c6618a0300eb69c828d0213555ec5fcf;p=openembedded.git

Merge ... '355262927125dc01051bf0f6b36fc492b766c9d7'
     and '60557e20a6b9593541f74b8231f50e85bf385819'
---

3da9a257c6618a0300eb69c828d0213555ec5fcf