From: Koen Kooi <koen@openembedded.org>
Date: Fri, 4 Aug 2006 07:33:42 +0000 (+0000)
Subject: merge of '3cc9017ec1982d67d07a8059097acd2ee7b8c42c'
X-Git-Tag: Release-2010-05/1~9453^2~1007
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3e6c814794c2b9ad699b999e397cea8e95db139e;p=openembedded.git

Merge ... '3cc9017ec1982d67d07a8059097acd2ee7b8c42c'
     and '87cb6d5388e06c52d5471051180223acb92bd54e'
---

3e6c814794c2b9ad699b999e397cea8e95db139e