From: Rod Whitby <rod@whitby.id.au>
Date: Sat, 2 Jun 2007 10:45:16 +0000 (+0000)
Subject: merge of '47c01740d6df38376dfcb0407a0b42bb05e60a2b'
X-Git-Tag: Release-2010-05/1~8868^2~400^2~94
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d195f2b1ad6079a2834a38bbd71ad47a8607fc12;p=openembedded.git

Merge ... '47c01740d6df38376dfcb0407a0b42bb05e60a2b'
     and '8701b75312bc85935a3f37b136efa282813c426f'
---

d195f2b1ad6079a2834a38bbd71ad47a8607fc12