From: Rod Whitby <rod@whitby.id.au>
Date: Sat, 2 Jun 2007 16:47:40 +0000 (+0000)
Subject: merge of '18ed2772b803c74be19752144c8ae81a577c9f06'
X-Git-Tag: Release-2010-05/1~8868^2~400^2~91
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4eb166a0f1b8c0db307a5289e3c6db9f913e3f85;p=openembedded.git

Merge ... '18ed2772b803c74be19752144c8ae81a577c9f06'
     and '337a5b25ca63db8c280a6eb478dba96f7fb3b342'
---

4eb166a0f1b8c0db307a5289e3c6db9f913e3f85