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

Merge ... '1af7742e17a7556d323fd4873c9ad1dc74655d34'
     and '24c7203b69a8d8da8f6cacbf0180f1fc57efa6c1'
---

f77756481ff953f4ead07bb093b36b96ba1a2135