From: Rod Whitby <rod@whitby.id.au>
Date: Fri, 30 Mar 2007 20:10:27 +0000 (+0000)
Subject: merge of '24a361b09feb3d013916a5f821f3e40842578ebd'
X-Git-Tag: Release-2010-05/1~8868^2~875^2~7
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0159d92a1de8f5e915c7d0a4f54aec6eb6d9a174;p=openembedded.git

Merge ... '24a361b09feb3d013916a5f821f3e40842578ebd'
     and 'ebdffc893fb36ab4655f6e5b18629fee23d9da16'
---

0159d92a1de8f5e915c7d0a4f54aec6eb6d9a174