From: Richard Purdie <rpurdie@rpsys.net>
Date: Sun, 3 Feb 2008 00:16:26 +0000 (+0000)
Subject: merge of '6bcbba52935837d8cc6bbd2b56f5836157870682'
X-Git-Tag: Release-2010-05/1~7765^2~7^2~4
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ce5f59bb21cd07436d8b661e1c5205d9d5f1efe6;p=openembedded.git

Merge ... '6bcbba52935837d8cc6bbd2b56f5836157870682'
     and 'f83b56f2c6061d5f1487eab87b4530480d6bb88e'
---

ce5f59bb21cd07436d8b661e1c5205d9d5f1efe6