From: Rod Whitby <rod@whitby.id.au>
Date: Sat, 22 Sep 2007 10:16:58 +0000 (+0000)
Subject: merge of 'b77bbe31e8594f7d7724c20dd668f62a3ecac8f0'
X-Git-Tag: Release-2010-05/1~8616^2^2^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d51fb9edae8caefc9a5d4e7b78fe19b94774acfb;p=openembedded.git

Merge ... 'b77bbe31e8594f7d7724c20dd668f62a3ecac8f0'
     and 'e3fa4ab0e51ec72d171b5d973d3cdbdafe22b60c'
---

d51fb9edae8caefc9a5d4e7b78fe19b94774acfb