From: Marcin Juszkiewicz <hrw@openembedded.org>
Date: Sun, 7 Jan 2007 00:48:49 +0000 (+0000)
Subject: merge of '23aaca50b161d66de0dd1f96937010f0ad1f1f54'
X-Git-Tag: Release-2010-05/1~9435^2~12^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=da49fe48efae614c0b7b61f99779efae5611f53e;p=openembedded.git

Merge ... '23aaca50b161d66de0dd1f96937010f0ad1f1f54'
     and '7dbeb5e383fa2bee20df397e69caddaee824c644'
---

da49fe48efae614c0b7b61f99779efae5611f53e