From: Rod Whitby <rod@whitby.id.au>
Date: Sun, 4 Feb 2007 21:00:19 +0000 (+0000)
Subject: merge of '9854932ee8e3c0cfaf427abbdf5b804b7f7f9d91'
X-Git-Tag: Release-2010-05/1~9286^2^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3c687d1dbfd455c79126341112c381cd24f86bdb;p=openembedded.git

Merge ... '9854932ee8e3c0cfaf427abbdf5b804b7f7f9d91'
     and 'd7d5cb097f959159a7ba2d55828e3be38f7830dd'
---

3c687d1dbfd455c79126341112c381cd24f86bdb