From: Paul Sokolovsky <pmiscml@gmail.com>
Date: Fri, 13 Oct 2006 10:17:25 +0000 (+0000)
Subject: merge of '5369901ff675d4c926113d856ce9da4c8c12fed0'
X-Git-Tag: Release-2010-05/1~9453^2~567^2~212^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9a2b3931df3f7fb7fbde7ea420cf58f78bf5ae62;p=openembedded.git

Merge ... '5369901ff675d4c926113d856ce9da4c8c12fed0'
     and '71b1cbe678cd91cfaf67632c7cbe2a37cb593a48'
---

9a2b3931df3f7fb7fbde7ea420cf58f78bf5ae62