From: Rod Whitby <rod@whitby.id.au>
Date: Wed, 29 Aug 2007 13:07:28 +0000 (+0000)
Subject: merge of '288504c0e005ddaf483f67c32ceb9648a94cc671'
X-Git-Tag: Release-2010-05/1~8781
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2d539e8f1c52a81e7fbaaf9c5f1282aed158b273;p=openembedded.git

Merge ... '288504c0e005ddaf483f67c32ceb9648a94cc671'
     and '3388a823662072c321fa2858d30420bd4ce65421'
---

2d539e8f1c52a81e7fbaaf9c5f1282aed158b273