From: Marcin Juszkiewicz <hrw@openembedded.org>
Date: Wed, 4 Apr 2007 20:01:33 +0000 (+0000)
Subject: merge of '9e29945dfdbfc2fec2c1df2f2690b9e3a59ae6d0'
X-Git-Tag: Release-2010-05/1~8868^2~776^2~11
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2afe5b4046ac057539cad88f3df03d8685ff0a15;p=openembedded.git

Merge ... '9e29945dfdbfc2fec2c1df2f2690b9e3a59ae6d0'
     and 'bb678746461a120f0e199de2782ede836dc1b795'
---

2afe5b4046ac057539cad88f3df03d8685ff0a15