From: Koen Kooi <koen@openembedded.org>
Date: Sat, 20 Sep 2008 11:54:00 +0000 (+0000)
Subject: merge of '06df0f40b1d36f22a5e9a1ddc32dbed08ea25373'
X-Git-Tag: Release-2010-05/1~6047
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=90e8091ac40331f518fd1865692dd412ab8d240c;p=openembedded.git

Merge ... '06df0f40b1d36f22a5e9a1ddc32dbed08ea25373'
     and '549d74d276248489dc6922e55359e9b25d94f07c'
---

90e8091ac40331f518fd1865692dd412ab8d240c