From: Leon Woestenberg <leon.woestenberg@gmail.com>
Date: Fri, 23 May 2008 15:59:49 +0000 (+0000)
Subject: merge of '5135d5b0b85d509b8af80d221f18563d4ce62475'
X-Git-Tag: Release-2010-05/1~6880^2~1^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=33b90e2dbb1f21ba4511f3e85dfeab1ae24502c4;p=openembedded.git

Merge ... '5135d5b0b85d509b8af80d221f18563d4ce62475'
     and '8b21a69e52feb768f1d096aa78e44dd20ce3aed4'
---

33b90e2dbb1f21ba4511f3e85dfeab1ae24502c4