From: Rod Whitby <rod@whitby.id.au>
Date: Wed, 30 May 2007 10:18:45 +0000 (+0000)
Subject: merge of '05c8f69b2d2ba03b628ce8728fe2137af29844b1'
X-Git-Tag: Release-2010-05/1~8868^2~400^2~99^2^2^2~1^2
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bf3963ad44dc76d96b81aed16f8c84eb8751c489;p=openembedded.git

Merge ... '05c8f69b2d2ba03b628ce8728fe2137af29844b1'
     and '6138ca9835c33fa432008f157293e2b0c2b6d7c7'
---

bf3963ad44dc76d96b81aed16f8c84eb8751c489