From: Koen Kooi <koen@openembedded.org>
Date: Fri, 8 Aug 2008 14:45:23 +0000 (+0000)
Subject: merge of '9e9036263aa2cf4c53293c1bd44b54810ab8834f'
X-Git-Tag: Release-2010-05/1~6333^2~54
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3128542861bfd2b9c06c62a589f7a64aecc23cca;p=openembedded.git

Merge ... '9e9036263aa2cf4c53293c1bd44b54810ab8834f'
     and 'bfc7cf00ad3b7b17b8c438b23a1b5de36ceef986'
---

3128542861bfd2b9c06c62a589f7a64aecc23cca