From: Koen Kooi <koen@openembedded.org>
Date: Fri, 11 Jan 2008 07:31:27 +0000 (+0000)
Subject: merge of '171c5d74e25e7c161bf23648620a923e90cfcc5b'
X-Git-Tag: Release-2010-05/1~7972
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dfbc34973c10aacdacb78950099ba4e105b002ef;p=openembedded.git

Merge ... '171c5d74e25e7c161bf23648620a923e90cfcc5b'
     and 'e52ff8ea262ab9963525b0a0f6ac0f631d53e597'
---

dfbc34973c10aacdacb78950099ba4e105b002ef