From: Rod Whitby <rod@whitby.id.au>
Date: Sun, 19 Aug 2007 01:04:47 +0000 (+0000)
Subject: merge of '2b0c6d15b30870f04728a138d2e30c4720e47fa6'
X-Git-Tag: Release-2010-05/1~8913
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a402824b70d5f285e86e85929de5dd022fc1871b;p=openembedded.git

Merge ... '2b0c6d15b30870f04728a138d2e30c4720e47fa6'
     and '7dcfdc2af0ae972634d8a71244289786c34a446b'
---

a402824b70d5f285e86e85929de5dd022fc1871b