From: Rod Whitby <rod@whitby.id.au>
Date: Sat, 6 Jan 2007 12:21:57 +0000 (+0000)
Subject: merge of '66b41b8997b569b1c7bab96deb57ca0bcf5282fe'
X-Git-Tag: Release-2010-05/1~9455^2~5
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8bff2d333946ac1261900baa4665cb902d3b9461;p=openembedded.git

Merge ... '66b41b8997b569b1c7bab96deb57ca0bcf5282fe'
     and '6b8185c89368b273f776e5735aeff0d2933002ae'
---

8bff2d333946ac1261900baa4665cb902d3b9461