From: Justin Patrin <papercrane@gmail.com>
Date: Thu, 16 Nov 2006 00:04:13 +0000 (+0000)
Subject: merge of '1d5bc74366555c918ab3f1f2f9c2231aa64356ae'
X-Git-Tag: Release-2010-05/1~9453^2~464
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=613eec68116d896501033b3e88d85ea0ebef668d;p=openembedded.git

Merge ... '1d5bc74366555c918ab3f1f2f9c2231aa64356ae'
     and '96668be22966346391b27778ded3a562fb280fce'
---

613eec68116d896501033b3e88d85ea0ebef668d