From: Rod Whitby <rod@whitby.id.au>
Date: Fri, 9 Mar 2007 16:38:23 +0000 (+0000)
Subject: merge of '6e3d378d98664dd166068b0a10b4908d224b2da6'
X-Git-Tag: Release-2010-05/1~8868^2~1121^2^2~7^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1397d03fcffaffe97898478c0cea75a0aa8a6628;p=openembedded.git

Merge ... '6e3d378d98664dd166068b0a10b4908d224b2da6'
     and 'cc42f5920681427f906758dd8c3c6cdc74d5952e'
---

1397d03fcffaffe97898478c0cea75a0aa8a6628