From: Koen Kooi <koen@openembedded.org>
Date: Wed, 10 Sep 2008 19:12:47 +0000 (+0000)
Subject: merge of '395315f21c6ec4386dc02169f7f643cb89cbaed4'
X-Git-Tag: Release-2010-05/1~6111
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6c20990ab3fa41d44b92b727897955bf523ecd09;p=openembedded.git

Merge ... '395315f21c6ec4386dc02169f7f643cb89cbaed4'
     and 'cf5908ce033a5955f8dfb1484a6b093f59e90032'
---

6c20990ab3fa41d44b92b727897955bf523ecd09