From: Marcin Juszkiewicz <hrw@openembedded.org>
Date: Fri, 7 Dec 2007 10:59:34 +0000 (+0000)
Subject: merge of '105955293719b2a1414f1b03af410b8ff8dbdb1b'
X-Git-Tag: Release-2010-05/1~8180^2~8^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3aefe52f532d621bfad7109bb8f03bcbc32833dd;p=openembedded.git

Merge ... '105955293719b2a1414f1b03af410b8ff8dbdb1b'
     and 'c238596b6479864883292d3fa663a0cfd751e5a6'
---

3aefe52f532d621bfad7109bb8f03bcbc32833dd