From: Mike Westerhof <mwester@dls.net>
Date: Fri, 28 Mar 2008 06:01:41 +0000 (+0000)
Subject: merge of '3f7c924df24e54d34133232f41e48dd253227542'
X-Git-Tag: Release-2010-05/1~7260
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dccf02ef2af0ff9c34aa9503be88035d33687327;p=openembedded.git

Merge ... '3f7c924df24e54d34133232f41e48dd253227542'
     and '53456ed8edb2c9fe305ce7764182d17d7c84e129'
---

dccf02ef2af0ff9c34aa9503be88035d33687327