From: Matt Reimer <mattjreimer@gmail.com>
Date: Tue, 14 Nov 2006 23:09:05 +0000 (+0000)
Subject: merge of '00ee303d8d48b4b6a0a7480dea928c8d02252f80'
X-Git-Tag: Release-2010-05/1~9455^2~495^2~3
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5d16aa12d077d2bd9182f20c6217cc751063bcb3;p=openembedded.git

Merge ... '00ee303d8d48b4b6a0a7480dea928c8d02252f80'
     and '376cbb96ee80de7e5cc9e7ceff199d6f09fe42d8'
---

5d16aa12d077d2bd9182f20c6217cc751063bcb3