From: Marcin Juszkiewicz <hrw@openembedded.org>
Date: Thu, 18 Oct 2007 11:16:50 +0000 (+0000)
Subject: merge of '1146b968b17a4186232fbe41a3a6eb7fe30cc300'
X-Git-Tag: Release-2010-05/1~8549^2~1^2~6
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=db2c72991c243b6a510cbd751ae6294a8130a4c4;p=openembedded.git

Merge ... '1146b968b17a4186232fbe41a3a6eb7fe30cc300'
     and '40ef55d01967050e97ee3727a1e5e15b968e0a92'
---

db2c72991c243b6a510cbd751ae6294a8130a4c4