From: Marcin Juszkiewicz <hrw@openembedded.org>
Date: Thu, 17 Jan 2008 15:39:09 +0000 (+0000)
Subject: merge of '964b970138436b573add519a1eae7ca7aec32517'
X-Git-Tag: Release-2010-05/1~7890^2~7
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9d1b8ff9cc28b6c4e0208b2cd0dc946b59b2b50f;p=openembedded.git

Merge ... '964b970138436b573add519a1eae7ca7aec32517'
     and 'b8eab3d0461de7af79a745d6b20c8e008acb7af4'
---

9d1b8ff9cc28b6c4e0208b2cd0dc946b59b2b50f