From: Philip Balister <philip@balister.org>
Date: Mon, 9 Oct 2006 22:09:39 +0000 (+0000)
Subject: merge of 'c1c61d69184ac07768aa0ccbfec85a0d7d87ec8f'
X-Git-Tag: Release-2010-05/1~9453^2~600
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a50a980691e21069de9cf7afcbbff00056be6a86;p=openembedded.git

Merge ... 'c1c61d69184ac07768aa0ccbfec85a0d7d87ec8f'
     and 'd34ae4bc4eedb46746f3e03ce6a8dedf8d1a566a'
---

a50a980691e21069de9cf7afcbbff00056be6a86