From: Rod Whitby <rod@whitby.id.au>
Date: Thu, 21 Dec 2006 21:32:44 +0000 (+0000)
Subject: merge of 0a670ad135de80006479fae559372bd4a2a6953e
X-Git-Tag: Release-2010-05/1~9453^2~27^2~11^2~2^2^2^2^2~3^2^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f548088abced79b0b59af36ef92cccd5166d8b97;p=openembedded.git

merge of 0a670ad135de80006479fae559372bd4a2a6953e
     and cc24d9073b5cceb01d58ae9f77971c5b4664cdfe
---

f548088abced79b0b59af36ef92cccd5166d8b97