From: Rod Whitby <rod@whitby.id.au>
Date: Sun, 25 Mar 2007 00:35:19 +0000 (+0000)
Subject: merge of '4b62fa79052d762d8ae8226a013c16c6ee6aa842'
X-Git-Tag: Release-2010-05/1~8868^2~987
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=48c89df36d2f9f4c13b0d479fc14145780927cbf;p=openembedded.git

Merge ... '4b62fa79052d762d8ae8226a013c16c6ee6aa842'
     and 'f246f66dc73bb9a4a723a8abd18f7d6b1a116411'
---

48c89df36d2f9f4c13b0d479fc14145780927cbf