From: Koen Kooi <koen@openembedded.org>
Date: Tue, 29 Aug 2006 09:07:38 +0000 (+0000)
Subject: merge of '736e3745c824a8c11dfc76795f69158b8940190a'
X-Git-Tag: Release-2010-05/1~9453^2~875^2~66^2~24^2~2^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a7279a2894397237252dc4274ef6c4c6192780bb;p=openembedded.git

Merge ... '736e3745c824a8c11dfc76795f69158b8940190a'
     and 'aa2272bf90f42c5648bd3b21c7395aeb71f025fd'
---

a7279a2894397237252dc4274ef6c4c6192780bb