From: Koen Kooi <koen@openembedded.org>
Date: Wed, 8 Aug 2007 14:29:01 +0000 (+0000)
Subject: merge of '3e30d03effd5d61bd64c55ec0e69214ced9039ca'
X-Git-Tag: Release-2010-05/1~9076^2~4^2~5
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=552c23e24e7bda6eb86761fde234d3bb1dc89cef;p=openembedded.git

Merge ... '3e30d03effd5d61bd64c55ec0e69214ced9039ca'
     and 'bf37569e4e207171af4ea9b1e9879b303cedf759'
---

552c23e24e7bda6eb86761fde234d3bb1dc89cef