From: Rod Whitby <rod@whitby.id.au>
Date: Sun, 19 Aug 2007 07:44:18 +0000 (+0000)
Subject: merge of '096af4db5787781750ffca1b165b4c7e87bc2c94'
X-Git-Tag: Release-2010-05/1~8908
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e8547a7639806c7031c93323681736f86f3b6adb;p=openembedded.git

Merge ... '096af4db5787781750ffca1b165b4c7e87bc2c94'
     and 'd5497549302f40a104bf1e0bb07bed2326a311cc'
---

e8547a7639806c7031c93323681736f86f3b6adb