From: Koen Kooi <koen@openembedded.org>
Date: Thu, 15 Feb 2007 20:20:32 +0000 (+0000)
Subject: merge of '17456d839ed6d5a9ca1e700a26784cc663820a4d'
X-Git-Tag: Release-2010-05/1~9230^2~26
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=342f01d322bcc1ee34549fdc8f8db7555568b329;p=openembedded.git

Merge ... '17456d839ed6d5a9ca1e700a26784cc663820a4d'
     and 'ffd5b1436a28fe33ef6213ae4b0371af61aad94f'
---

342f01d322bcc1ee34549fdc8f8db7555568b329