From: Marcin Juszkiewicz <hrw@openembedded.org>
Date: Thu, 26 Apr 2007 19:45:19 +0000 (+0000)
Subject: merge of '52b8f41a965e291eede4b4094b41d82b1b115c2f'
X-Git-Tag: Release-2010-05/1~8868^2~660^2~34^2~4
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3cf447d1990e83a036a0272adb5eb198a8338784;p=openembedded.git

Merge ... '52b8f41a965e291eede4b4094b41d82b1b115c2f'
     and '8a96b7a7e6f32d11685d21a5c12d5420a27e8110'
---

3cf447d1990e83a036a0272adb5eb198a8338784