From: Rod Whitby <rod@whitby.id.au>
Date: Wed, 23 Aug 2006 17:01:09 +0000 (+0000)
Subject: merge of 189ca8e444a592299f4b0bd906b26afaeab4ba3b
X-Git-Tag: Release-2010-05/1~9453^2~878^2~2^2^2^2~2^2^2~1^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=15c89f47fa42e32968fb15f37765d6e5a4118a62;p=openembedded.git

merge of 189ca8e444a592299f4b0bd906b26afaeab4ba3b
     and 784b6c6662b613aaddd772f5e839ca963189486d
---

15c89f47fa42e32968fb15f37765d6e5a4118a62