From: Rod Whitby <rod@whitby.id.au>
Date: Sun, 27 May 2007 22:48:50 +0000 (+0000)
Subject: merge of '80e89ea6e10ab76e3aac0f79be7b3fdfba71e2b7'
X-Git-Tag: Release-2010-05/1~8868^2~400^2~99^2^2^2~1^2~2^2~1
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8574ff41bb04dbc68624c491f45a336ffd27e81e;p=openembedded.git

Merge ... '80e89ea6e10ab76e3aac0f79be7b3fdfba71e2b7'
     and 'e35c79c0e44e6a58add42e2dc50ecfaad4e02c0e'
---

8574ff41bb04dbc68624c491f45a336ffd27e81e