From: Cliff Brake <cbrake@bec-systems.com>
Date: Sat, 26 Apr 2008 13:35:22 +0000 (+0000)
Subject: merge of '1a467a7ea8dfd7463354c140383975aa0b8b20e8'
X-Git-Tag: Release-2010-05/1~7106
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=22ac273df7f61176476381d2ee82cdca74867b6e;p=openembedded.git

Merge ... '1a467a7ea8dfd7463354c140383975aa0b8b20e8'
     and '60d4d904e10f8212b1c2242377b31ccc2e29e374'
---

22ac273df7f61176476381d2ee82cdca74867b6e