From: Rod Whitby <rod@whitby.id.au>
Date: Thu, 27 Mar 2008 05:31:20 +0000 (+0000)
Subject: merge of '574e65dc4315f62dd912ceca4784d203ccc5fae0'
X-Git-Tag: Release-2010-05/1~7269
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b2370604ed175dc317a84e549e7adec85e7c50ec;p=openembedded.git

Merge ... '574e65dc4315f62dd912ceca4784d203ccc5fae0'
     and 'e561ab79ab11a574164c442f9dab7e936c145347'
---

b2370604ed175dc317a84e549e7adec85e7c50ec