From: Koen Kooi <koen@openembedded.org>
Date: Sat, 20 Jan 2007 15:53:26 +0000 (+0000)
Subject: merge of '57565ef68b5336bb18f16b962b9646b84daff984'
X-Git-Tag: Release-2010-05/1~9354^2~11
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=71fc427b1413e9655faf11367baf8bf91ced5a7e;p=openembedded.git

Merge ... '57565ef68b5336bb18f16b962b9646b84daff984'
     and '69802b5fc5dcf27f5b27f6a9a9aadb1f3a808b71'
---

71fc427b1413e9655faf11367baf8bf91ced5a7e