From: Philip Balister <philip@balister.org>
Date: Mon, 20 Nov 2006 21:56:55 +0000 (+0000)
Subject: merge of '1a8b8b461f0411e51d72fb156790d6c3a42558e1'
X-Git-Tag: Release-2010-05/1~9453^2~377
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3383588f87a41861aee25db50ac30e1a37bb57a6;p=openembedded.git

Merge ... '1a8b8b461f0411e51d72fb156790d6c3a42558e1'
     and '71deae698707365d8af709b9ddc7ca4b81741065'
---

3383588f87a41861aee25db50ac30e1a37bb57a6