From: Philip Balister <philip@balister.org>
Date: Fri, 20 Oct 2006 18:57:13 +0000 (+0000)
Subject: merge of '83c4f209d12306d38f3b5bdb26e65c3a97013417'
X-Git-Tag: Release-2010-05/1~9453^2~567^2~71^2^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f1200453492bffa43f2945393dd5e7c67d1d6a66;p=openembedded.git

Merge ... '83c4f209d12306d38f3b5bdb26e65c3a97013417'
     and '83d7c4d760eeb9ffa8b4c744fbd257d182d6a207'
---

f1200453492bffa43f2945393dd5e7c67d1d6a66