From: Graeme Gregory <dp@xora.org.uk>
Date: Mon, 16 Jun 2008 11:18:00 +0000 (+0000)
Subject: merge of '5f8c61f539e6f103dcfa53a341944eb1b46c96fe'
X-Git-Tag: Release-2010-05/1~6680
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=92a95e65fd8a2ff4b324c512879811701cf40209;p=openembedded.git

Merge ... '5f8c61f539e6f103dcfa53a341944eb1b46c96fe'
     and '5fc614e5aaeec54eb6667a7a09ba920551217a7f'
---

92a95e65fd8a2ff4b324c512879811701cf40209