From: Rod Whitby <rod@whitby.id.au>
Date: Fri, 13 Apr 2007 12:18:24 +0000 (+0000)
Subject: merge of '7b1b675acdab1f2f94fa198937d17e71465a6251'
X-Git-Tag: Release-2010-05/1~8868^2~261^2~27^2~34^2~2^2~5^2^2^2~1^2~2^2^2~2^2^2~6^2^2~1^2~1^2^2~1^2^2^2^2~4^2~1^2~1^2^2^2^2^2
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ebeaab7be21dd0b2aaedbf929f8e4a76a0c2ad12;p=openembedded.git

Merge ... '7b1b675acdab1f2f94fa198937d17e71465a6251'
     and 'ea2cdd5b56f48503576d815730d28e0a97f397bf'
---

ebeaab7be21dd0b2aaedbf929f8e4a76a0c2ad12