From: Marcin Juszkiewicz <hrw@openembedded.org>
Date: Sun, 14 Oct 2007 14:38:23 +0000 (+0000)
Subject: merge of '3157b6fd0bec0b66971ea7b32ac57dc1a5c92940'
X-Git-Tag: Release-2010-05/1~8549^2~1^2~64
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=116726446db49a9dbc97cfedcaa17f9784da9cf2;p=openembedded.git

Merge ... '3157b6fd0bec0b66971ea7b32ac57dc1a5c92940'
     and 'd4ef8ebf38cc9ef7573a49017e35bd326024f285'
---

116726446db49a9dbc97cfedcaa17f9784da9cf2