From: Koen Kooi <koen@openembedded.org>
Date: Wed, 30 Jul 2008 15:15:43 +0000 (+0000)
Subject: merge of '4d6ee85cc3ba867945ab4763b494533e79d9e0ac'
X-Git-Tag: Release-2010-05/1~6427
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=290c319caa59d7442b1606f3dfbabef370310400;p=openembedded.git

Merge ... '4d6ee85cc3ba867945ab4763b494533e79d9e0ac'
     and '750fe5c3f11c985f4ea63c4d0e6a98d0326f40b7'
---

290c319caa59d7442b1606f3dfbabef370310400