From: Koen Kooi <koen@openembedded.org>
Date: Tue, 31 Jul 2007 07:17:35 +0000 (+0000)
Subject: merge of '3903211109bcf34b8e6540e6f23ab4860f0236d8'
X-Git-Tag: Release-2010-05/1~8868^2~64^2~15
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=aa55a98a837d301b8cd529ae3b7c041bdecb31dc;p=openembedded.git

Merge ... '3903211109bcf34b8e6540e6f23ab4860f0236d8'
     and '5aa52a23ca3ba7054d5e294b0347d5f5e02dc077'
---

aa55a98a837d301b8cd529ae3b7c041bdecb31dc