From: Rod Whitby <rod@whitby.id.au>
Date: Tue, 6 Feb 2007 09:43:37 +0000 (+0000)
Subject: merge of '24d82a2b5a32fe5d1e0f3aa0049aaa50eb5ba7bc'
X-Git-Tag: Release-2010-05/1~9273^2~4
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5679a04a144b4898a44e8a25cfe92064832fb98a;p=openembedded.git

Merge ... '24d82a2b5a32fe5d1e0f3aa0049aaa50eb5ba7bc'
     and '2c6de6579f49b4666352be054c76acd300924753'
---

5679a04a144b4898a44e8a25cfe92064832fb98a