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

merge of bb8a3b34208ff63b05eb2b6f77183737b9a38c6a
     and efe5ba84574e7ae7e86f7fb34cf883a21c2144bb
---

2031ed0948c018ac1d1c0e33eb1e76d2fccb8b38