From: Matt Reimer <mattjreimer@gmail.com>
Date: Fri, 1 Sep 2006 19:08:29 +0000 (+0000)
Subject: merge of '5973cff7074d3746ce1b548caf58e7dd6aae2826'
X-Git-Tag: Release-2010-05/1~9453^2~875^2~98
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cb2107cd2a8efc26466a30b4b8a11ee709737c99;p=openembedded.git

Merge ... '5973cff7074d3746ce1b548caf58e7dd6aae2826'
     and '9c307d34e162395d96ddb6e808059ea8c3361f74'
---

cb2107cd2a8efc26466a30b4b8a11ee709737c99