From: Rod Whitby <rod@whitby.id.au>
Date: Thu, 27 Dec 2007 22:31:14 +0000 (+0000)
Subject: merge of 'bed1f45d5c2e76fbd336580d09caef10c613f256'
X-Git-Tag: Release-2010-05/1~8073
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=82c526e5d8f578bb0b3826ce5f71248a7338ed17;p=openembedded.git

Merge ... 'bed1f45d5c2e76fbd336580d09caef10c613f256'
     and 'fbb56d5a76093891efdc7abc682059fd0436d4be'
---

82c526e5d8f578bb0b3826ce5f71248a7338ed17