From: Rod Whitby <rod@whitby.id.au>
Date: Sun, 9 Sep 2007 11:59:45 +0000 (+0000)
Subject: merge of '1cc47f2936bc6346f6e03128eb46345963c599a3'
X-Git-Tag: Release-2010-05/1~8701^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fb407f654d8492a1a08b769fa8a74634c8ed391e;p=openembedded.git

Merge ... '1cc47f2936bc6346f6e03128eb46345963c599a3'
     and '4d05fe1b9b1c9939ad7429871e3fbf805a8d316b'
---

fb407f654d8492a1a08b769fa8a74634c8ed391e