From: Rod Whitby <rod@whitby.id.au>
Date: Sun, 30 Oct 2005 00:16:40 +0000 (+0000)
Subject: merge of 8bfbc13386e9803228f6e1221669b7cb6a379c18
X-Git-Tag: Release-2010-05/1~9453^2~3169
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e0459172b694c509094b311c34359b660fd50caf;p=openembedded.git

merge of 8bfbc13386e9803228f6e1221669b7cb6a379c18
     and ee91eab40e16fd26e3a706434e40d97953ccc457
---

e0459172b694c509094b311c34359b660fd50caf