From: Rod Whitby <rod@whitby.id.au>
Date: Thu, 6 Sep 2007 20:51:53 +0000 (+0000)
Subject: merge of '31f5a286594a5bbefbd62d34485ab695172c7f17'
X-Git-Tag: Release-2010-05/1~8701^2~8^2~1^2~1^2^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4643f95c08498301f099753fc99ba3566ddc506b;p=openembedded.git

Merge ... '31f5a286594a5bbefbd62d34485ab695172c7f17'
     and 'abf691e484310ced8674e16092ab962cb2d94941'
---

4643f95c08498301f099753fc99ba3566ddc506b