From: Koen Kooi <koen@openembedded.org>
Date: Thu, 31 Aug 2006 08:13:59 +0000 (+0000)
Subject: merge of 'b85e20731701ef2d7dc18d059fe5b5cd0e2eb8ac'
X-Git-Tag: Release-2010-05/1~9453^2~875^2~129
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c4185213571da8e53438e2b67da55d89e3a07d36;p=openembedded.git

Merge ... 'b85e20731701ef2d7dc18d059fe5b5cd0e2eb8ac'
     and 'c43717e39b2264f3f2b9c639768c9aa1c74bc48e'
---

c4185213571da8e53438e2b67da55d89e3a07d36