From: Marcin Juszkiewicz <hrw@openembedded.org>
Date: Fri, 26 Oct 2007 13:20:39 +0000 (+0000)
Subject: merge of '3664c8386a83989b0e4b61c25a0c3f5782c2b71f'
X-Git-Tag: Release-2010-05/1~8454^2~110^2~8
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=918240fb5a1768cabb55ea7e682ef8e45ba52953;p=openembedded.git

Merge ... '3664c8386a83989b0e4b61c25a0c3f5782c2b71f'
     and 'b968656776ab23ced6e8710b760e509bfc537fe1'
---

918240fb5a1768cabb55ea7e682ef8e45ba52953