From: Rod Whitby <rod@whitby.id.au>
Date: Fri, 22 Dec 2006 10:01:42 +0000 (+0000)
Subject: merge of 0960bd2ad1c045f0f0f29d79ec704ed73cfd5251
X-Git-Tag: Release-2010-05/1~9453^2~27^2~11^2~2^2^2^2^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=80f5544badf7466fe876c216c7a4f3b731523e53;p=openembedded.git

merge of 0960bd2ad1c045f0f0f29d79ec704ed73cfd5251
     and 3a790499e1fa803fd61e287cbe663b4036fd1cf0
---

80f5544badf7466fe876c216c7a4f3b731523e53