From: Koen Kooi <koen@openembedded.org>
Date: Thu, 15 Nov 2007 12:17:02 +0000 (+0000)
Subject: merge of '7a2606dc2c8a5d9ec61bddbad5d013a4bb7bd62a'
X-Git-Tag: Release-2010-05/1~8398^2^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=999b30c11ad6a81c62ef4bfca1169bce9f30fcb5;p=openembedded.git

Merge ... '7a2606dc2c8a5d9ec61bddbad5d013a4bb7bd62a'
     and 'babd660769343b37baf49a84b9c42caf9209315c'
---

999b30c11ad6a81c62ef4bfca1169bce9f30fcb5