From: Rod Whitby <rod@whitby.id.au>
Date: Fri, 13 Jan 2006 23:00:25 +0000 (+0000)
Subject: merge of 94dc534986dc5c018c2c127e01fa7cac5f51270a
X-Git-Tag: Release-2010-05/1~9453^2~2664
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3f33387bc82e8eb58d073b9fa39c27c2db3bcf8b;p=openembedded.git

merge of 94dc534986dc5c018c2c127e01fa7cac5f51270a
     and d64372f18fedb4c3445dc88accadfe7e01613642
---

3f33387bc82e8eb58d073b9fa39c27c2db3bcf8b