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

merge of 1829c32753153151d8b6dae056211e9e55c7fce1
     and fd22e946abe117169eb2505f30a12a2aa70f1a71
---

bbee2ac1c8efce4ad1515afdb63ea2942b7901cb