From: Justin Patrin <papercrane@gmail.com>
Date: Tue, 4 Apr 2006 21:29:08 +0000 (+0000)
Subject: merge of 4ad70d03f3a19dce2f2582ea1b294336864413d6
X-Git-Tag: Release-2010-05/1~9453^2~2099
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c90a7ccedc038f8739996174ec245c7e2f35dc05;p=openembedded.git

merge of 4ad70d03f3a19dce2f2582ea1b294336864413d6
     and 655f5a13bd458949813a8bf00c6865edb43cc35b
---

c90a7ccedc038f8739996174ec245c7e2f35dc05