From: Rod Whitby <rod@whitby.id.au>
Date: Sun, 27 May 2007 12:02:20 +0000 (+0000)
Subject: merge of '60f25719f044f04c78ec8cfa8af6a503b643df4e'
X-Git-Tag: Release-2010-05/1~8868^2~400^2~99^2^2^2~1^2~2^2~2
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=adcf47ee2b1d194d04faab31d13ee2c98d7306f6;p=openembedded.git

Merge ... '60f25719f044f04c78ec8cfa8af6a503b643df4e'
     and '920cdb6aefe97d8f4b6c86d0b508d346ff55fb5f'
---

adcf47ee2b1d194d04faab31d13ee2c98d7306f6