From: Justin Patrin <papercrane@gmail.com>
Date: Mon, 11 Sep 2006 22:59:53 +0000 (+0000)
Subject: merge of '4b5876260ca7de97ddf57046863ff17cf59f9346'
X-Git-Tag: Release-2010-05/1~9453^2~840^2~6
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1a6abbb7d365528938af5cd7a6648773cde6169b;p=openembedded.git

Merge ... '4b5876260ca7de97ddf57046863ff17cf59f9346'
     and 'df35446baef7d0a7c0873c1be6afed6f313c9415'
---

1a6abbb7d365528938af5cd7a6648773cde6169b