From: Rod Whitby <rod@whitby.id.au>
Date: Sat, 25 Aug 2007 12:06:05 +0000 (+0000)
Subject: merge of 'a3080faf3a125f45b97d49303612cf6bab9539cd'
X-Git-Tag: Release-2010-05/1~8789^2~29^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9573c58d40f9b76d8ff5c60d82f25542b8ae1f31;p=openembedded.git

Merge ... 'a3080faf3a125f45b97d49303612cf6bab9539cd'
     and 'd6d91eeea2717dbb2f84f543b7cba45548ba6dbc'
---

9573c58d40f9b76d8ff5c60d82f25542b8ae1f31