From: Rod Whitby <rod@whitby.id.au>
Date: Tue, 25 Apr 2006 22:44:46 +0000 (+0000)
Subject: merge of f0d5a9cad37301a7b5305db122880b04aa6a20b7
X-Git-Tag: Release-2010-05/1~9453^2~1805
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1cf22f7e5a6b828b374463d4c22e0213f88e703d;p=openembedded.git

merge of f0d5a9cad37301a7b5305db122880b04aa6a20b7
     and fd10e7e7e2425da1310503d4f79c27673a6294f0
---

1cf22f7e5a6b828b374463d4c22e0213f88e703d