From: Koen Kooi <koen@openembedded.org>
Date: Thu, 15 Nov 2007 14:10:54 +0000 (+0000)
Subject: merge of '33fb6aa0bcede524e3a5d6d9f4e9ed212a2c2335'
X-Git-Tag: Release-2010-05/1~8396
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3515feb8a17b9d84bee4d11191842223ce6f76a6;p=openembedded.git

Merge ... '33fb6aa0bcede524e3a5d6d9f4e9ed212a2c2335'
     and 'b21b578d6a02e2eb83b67423222b1cb7e6fcfc49'
---

3515feb8a17b9d84bee4d11191842223ce6f76a6