From: Marcin Juszkiewicz <hrw@openembedded.org>
Date: Fri, 13 Oct 2006 17:34:24 +0000 (+0000)
Subject: merge of '948a3826e06f14adc54097e1356e07ee2779f1b6'
X-Git-Tag: Release-2010-05/1~9453^2~567^2~193
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a569a19e6d0652551a5cfb00e6f9d913a2b25b32;p=openembedded.git

Merge ... '948a3826e06f14adc54097e1356e07ee2779f1b6'
     and 'a432db96d075c07f39a31ed168e1dfe9996f7a9a'
---

a569a19e6d0652551a5cfb00e6f9d913a2b25b32