From: Rod Whitby <rod@whitby.id.au>
Date: Thu, 1 Feb 2007 16:28:52 +0000 (+0000)
Subject: merge of '6195344af4478dbf48ebc1966c06a53ec58c73a6'
X-Git-Tag: Release-2010-05/1~9302
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8b93aed08f519bf4b6a27c9f82558c86b2db39bf;p=openembedded.git

Merge ... '6195344af4478dbf48ebc1966c06a53ec58c73a6'
     and '6f6ac342889199e002e7bb44642a598e822af19e'
---

8b93aed08f519bf4b6a27c9f82558c86b2db39bf