From: Cliff Brake <cbrake@bec-systems.com>
Date: Sat, 6 Jan 2007 20:40:57 +0000 (+0000)
Subject: merge of 'a7c105926e0b0083886d25095383bca3bee3f6b9'
X-Git-Tag: Release-2010-05/1~9435^2~14^2~13
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d7088faa1bee47c4ad987c24a76db38316606b75;p=openembedded.git

Merge ... 'a7c105926e0b0083886d25095383bca3bee3f6b9'
     and 'a88c6575a760656e837fbfbb6bdcf2784ac0bf3f'
---

d7088faa1bee47c4ad987c24a76db38316606b75