From: Paul Sokolovsky <pmiscml@gmail.com>
Date: Thu, 2 Nov 2006 02:47:02 +0000 (+0000)
Subject: merge of '304cf1e2ee9564907e629d2924be3146ffdec329'
X-Git-Tag: Release-2010-05/1~9453^2~481^2~42
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=17ff5ce46ce9451e6ea22cb2c0fa43dadc676561;p=openembedded.git

Merge ... '304cf1e2ee9564907e629d2924be3146ffdec329'
     and '7b0b1b3eb34b3e216e5b616a595e38f031aec538'
---

17ff5ce46ce9451e6ea22cb2c0fa43dadc676561