From: Rod Whitby <rod@whitby.id.au>
Date: Wed, 29 Nov 2006 12:06:39 +0000 (+0000)
Subject: merge of '0bb5f3998d4f44cc03385e6faf36b48a3e409038'
X-Git-Tag: Release-2010-05/1~9453^2~232^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=45e84e1e16a4f6adae35c692665dc1edf9e3c729;p=openembedded.git

Merge ... '0bb5f3998d4f44cc03385e6faf36b48a3e409038'
     and 'bf81f1dd32251679f83fb6d65f199538128566aa'
---

45e84e1e16a4f6adae35c692665dc1edf9e3c729