From: Rod Whitby <rod@whitby.id.au>
Date: Sat, 31 Mar 2007 16:05:07 +0000 (+0000)
Subject: merge of '83ea82833998c0b89a47616d782403af5f8db662'
X-Git-Tag: Release-2010-05/1~8868^2~866
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c587d3835923168c4224705270381ea3e3fc2631;p=openembedded.git

Merge ... '83ea82833998c0b89a47616d782403af5f8db662'
     and 'd85c16a345e81ffef4d297f64fa8748858eaa851'
---

c587d3835923168c4224705270381ea3e3fc2631