From: Matt Reimer <mattjreimer@gmail.com>
Date: Wed, 21 Mar 2007 18:51:28 +0000 (+0000)
Subject: merge of '5b67d1cb3227253f3f4b525375b174d391b45a4a'
X-Git-Tag: Release-2010-05/1~8868^2~1032^2~3^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=99e5b69ffc199744e6a06d7a4c44d62fa1ed1070;p=openembedded.git

Merge ... '5b67d1cb3227253f3f4b525375b174d391b45a4a'
     and '6e08dddd36f6545a5ac5fc1ad87762258f2e4d01'
---

99e5b69ffc199744e6a06d7a4c44d62fa1ed1070