From: Rod Whitby <rod@whitby.id.au>
Date: Wed, 11 Apr 2007 07:11:36 +0000 (+0000)
Subject: merge of '82fb03e3d78d465b8f7903451af35bcae014501c'
X-Git-Tag: Release-2010-05/1~8868^2~704^2^2
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cbf858aaeca31c7fd4f56bb334cdefa37ddbddd9;p=openembedded.git

Merge ... '82fb03e3d78d465b8f7903451af35bcae014501c'
     and '895242856fcf260e6a8c8b8e33b96b1304232974'
---

cbf858aaeca31c7fd4f56bb334cdefa37ddbddd9