From: Marcin Juszkiewicz <hrw@openembedded.org>
Date: Tue, 12 Dec 2006 13:02:22 +0000 (+0000)
Subject: merge of '14cb91ca9bde319dd1a0b9521a6f7b44c8d5d462'
X-Git-Tag: Release-2010-05/1~9453^2~171^2~12
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ed03ff0e14485d9ce3cc117ea2f1a9921c5234b3;p=openembedded.git

Merge ... '14cb91ca9bde319dd1a0b9521a6f7b44c8d5d462'
     and 'cb60d14273a3350c9c89ea8f8808936e25a46b3b'
---

ed03ff0e14485d9ce3cc117ea2f1a9921c5234b3