From: Justin Patrin <papercrane@gmail.com>
Date: Tue, 23 Jan 2007 20:36:17 +0000 (+0000)
Subject: merge of '821236cd07549d1b91216012a2ef789aaad4c7a0'
X-Git-Tag: Release-2010-05/1~9352
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0a59f436a0caddc2e373e3520a72f5942df75e07;p=openembedded.git

Merge ... '821236cd07549d1b91216012a2ef789aaad4c7a0'
     and '850a38fab7beee1bbdabb6c9f27831e009310a0a'
---

0a59f436a0caddc2e373e3520a72f5942df75e07