From: Justin Patrin <papercrane@gmail.com>
Date: Fri, 17 Nov 2006 00:44:05 +0000 (+0000)
Subject: merge of '7d8c3952daf9f091a203b0e0fa34bb7a25273315'
X-Git-Tag: Release-2010-05/1~9453^2~434^2~30
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=31773235080d7e8430bed8849650a203cc0d1faf;p=openembedded.git

Merge ... '7d8c3952daf9f091a203b0e0fa34bb7a25273315'
     and 'ae57dc7e211a075ccdde416f0e1dea5d8dc190ee'
---

31773235080d7e8430bed8849650a203cc0d1faf