From: Matt Reimer <mattjreimer@gmail.com>
Date: Mon, 30 Oct 2006 19:10:43 +0000 (+0000)
Subject: merge of 'a476ffb306a90853f53198c680b4e561337bb4da'
X-Git-Tag: Release-2010-05/1~9455^2~495^2~4^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5f7acfb7fa919640d4b9e3a997ff4ddfc5a39569;p=openembedded.git

Merge ... 'a476ffb306a90853f53198c680b4e561337bb4da'
     and 'f1ff998614be8911a2a9c02be7779e97ebe5c292'
---

5f7acfb7fa919640d4b9e3a997ff4ddfc5a39569