From: Rod Whitby <rod@whitby.id.au>
Date: Fri, 7 Sep 2007 10:11:42 +0000 (+0000)
Subject: merge of '824a2834a0da85846fd46c99800d62eb14ebe522'
X-Git-Tag: Release-2010-05/1~8701^2~8^2~1^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1466cacb917668578f25aa2144425e2a1558e93a;p=openembedded.git

Merge ... '824a2834a0da85846fd46c99800d62eb14ebe522'
     and '93d42c42fbac9beca66c0c236f2fb48801155c94'
---

1466cacb917668578f25aa2144425e2a1558e93a