From: Rod Whitby <rod@whitby.id.au>
Date: Sun, 27 Jan 2008 11:06:16 +0000 (+0000)
Subject: merge of '094e9bfdecc01f2d12a93a7a0063b2cf030b7670'
X-Git-Tag: Release-2010-05/1~7829^2~11^2~9
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=61a894fa6c61f60bf9f6de2303dc64e01ed01723;p=openembedded.git

Merge ... '094e9bfdecc01f2d12a93a7a0063b2cf030b7670'
     and 'd2c5e48f5e8d93985cad4428d9ea88e583e8667d'
---

61a894fa6c61f60bf9f6de2303dc64e01ed01723