From: Rod Whitby <rod@whitby.id.au>
Date: Thu, 1 Feb 2007 02:17:28 +0000 (+0000)
Subject: merge of '3113cfe3acb79d8bce9b167f4840c404f744c7a4'
X-Git-Tag: Release-2010-05/1~9314
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4535a2191ae70715bf899c704e16bea65dd224cb;p=openembedded.git

Merge ... '3113cfe3acb79d8bce9b167f4840c404f744c7a4'
     and 'da7c8d017a4154208fc087bae975d8058f6c2e6f'
---

4535a2191ae70715bf899c704e16bea65dd224cb