From: Marcin Juszkiewicz <hrw@openembedded.org>
Date: Fri, 26 Oct 2007 14:48:57 +0000 (+0000)
Subject: merge of 'a41270f197c19482f466d5e12850e9c76c7358b5'
X-Git-Tag: Release-2010-05/1~8454^2~110^2~5
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c241a0745bcc75e61bc2522ef089483fb6037cc7;p=openembedded.git

Merge ... 'a41270f197c19482f466d5e12850e9c76c7358b5'
     and 'f3edd5c73b71cef16fcff1594f21d2d1af16cf3a'
---

c241a0745bcc75e61bc2522ef089483fb6037cc7