From: Rod Whitby <rod@whitby.id.au>
Date: Wed, 27 Dec 2006 23:32:58 +0000 (+0000)
Subject: merge of 8136011b9a0c1fa2ab8410bc7a02d99ee264d426
X-Git-Tag: Release-2010-05/1~9453^2~27^2~7^2~1^2^2^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d4f056efa86750f8703dabf1f92177299fa6e205;p=openembedded.git

merge of 8136011b9a0c1fa2ab8410bc7a02d99ee264d426
     and ba38f1add834ef18b0adcadae9316eaf8400e6ee
---

d4f056efa86750f8703dabf1f92177299fa6e205