From: Rod Whitby <rod@whitby.id.au>
Date: Sun, 27 Aug 2006 10:01:16 +0000 (+0000)
Subject: merge of 206882f2137f73ff7b526c9a93ca7485bfedfc4a
X-Git-Tag: Release-2010-05/1~9453^2~837^2~1^2^2~1^2~3^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9a02a3e1ed92f368875414400260e25d5176c553;p=openembedded.git

merge of 206882f2137f73ff7b526c9a93ca7485bfedfc4a
     and 5b5482ad5b6769c00f9796072b56eec22e850d26
---

9a02a3e1ed92f368875414400260e25d5176c553