From: Adrian Davey <ade@beth2.org>
Date: Tue, 20 Dec 2005 12:17:52 +0000 (+0000)
Subject: merge of 56f0ea6b2b447969899f4758a5a538eba3f2b44c
X-Git-Tag: Release-2010-05/1~9453^2~2894^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cb2d3b7f87c78ddcb9cd639516d177bdfd017c9b;p=openembedded.git

merge of 56f0ea6b2b447969899f4758a5a538eba3f2b44c
     and 70d8a72ef31e0d28a2da35ba944c64a5e5d9d7fb
---

cb2d3b7f87c78ddcb9cd639516d177bdfd017c9b