From: Rod Whitby <rod@whitby.id.au>
Date: Mon, 5 Dec 2005 18:49:59 +0000 (+0000)
Subject: merge of 643f20dce93bd762af1d4851da51ff1a73427476
X-Git-Tag: Release-2010-05/1~9453^2~2967^2~3^2~2^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=db9099806c46c4fc4be11d0a038a8015dc6ccffa;p=openembedded.git

merge of 643f20dce93bd762af1d4851da51ff1a73427476
     and 8d84c2b7d68f0db4213acc29ad871140c3dadfd2
---

db9099806c46c4fc4be11d0a038a8015dc6ccffa