From: Marcin Juszkiewicz <hrw@openembedded.org>
Date: Thu, 15 Feb 2007 13:13:35 +0000 (+0000)
Subject: merge of '6f820aa47b2adf3dabcea3acc51e15b7eae933ef'
X-Git-Tag: Release-2010-05/1~9230^2~17^2~1^2^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=20ba7ff25c634d2d917f93b854ed280a91422d09;p=openembedded.git

Merge ... '6f820aa47b2adf3dabcea3acc51e15b7eae933ef'
     and '760aa4900b6222376d10756436dd82ffe1ade2fa'
---

20ba7ff25c634d2d917f93b854ed280a91422d09