From: Rod Whitby <rod@whitby.id.au>
Date: Sat, 18 Aug 2007 13:46:30 +0000 (+0000)
Subject: merge of '33469de643b1cad4022de73b7ce97d808320e465'
X-Git-Tag: Release-2010-05/1~8917
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8ada12e06fcd97e2a081270a7bc2621bb8766b87;p=openembedded.git

Merge ... '33469de643b1cad4022de73b7ce97d808320e465'
     and 'f012bf85fd4c2065b5824f7a0b63bb0a53cccb06'
---

8ada12e06fcd97e2a081270a7bc2621bb8766b87