From: Rod Whitby <rod@whitby.id.au>
Date: Tue, 6 Dec 2005 09:16:14 +0000 (+0000)
Subject: merge of 2812814e008a70fdc0a1a8e0c011f96d8f67b57b
X-Git-Tag: Release-2010-05/1~9453^2~2967^2~3^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8a4cbfe4e291a9785b09d788b999be2abf3af4cf;p=openembedded.git

merge of 2812814e008a70fdc0a1a8e0c011f96d8f67b57b
     and 477a6d0aedc8faf8f5a2d9cc48fd1855759d7313
---

8a4cbfe4e291a9785b09d788b999be2abf3af4cf