From: Koen Kooi <koen@openembedded.org>
Date: Thu, 15 May 2008 07:22:21 +0000 (+0000)
Subject: merge of '0c6f4fed33f17c5c3b0e7416ecda652fda206d63'
X-Git-Tag: Release-2010-05/1~6939^2~4
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f44125b60d426fb5778b5a145e526e2714516646;p=openembedded.git

Merge ... '0c6f4fed33f17c5c3b0e7416ecda652fda206d63'
     and 'aa3097d17325c17ff5fe04479d9a3a47ec96d299'
---

f44125b60d426fb5778b5a145e526e2714516646