From: Cliff Brake <cbrake@bec-systems.com>
Date: Fri, 5 Oct 2007 13:18:02 +0000 (+0000)
Subject: merge of '85bef9cf2a4d932a8fbf47debbef8a63813c0ee2'
X-Git-Tag: Release-2010-05/1~8549^2~1^2~128^2~10
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=46402f1cbf6c8caa0b6186552ef1f2b014405faf;p=openembedded.git

Merge ... '85bef9cf2a4d932a8fbf47debbef8a63813c0ee2'
     and 'ffbbde7aaaeef406e447de0ac0ebac56b9ed4157'
---

46402f1cbf6c8caa0b6186552ef1f2b014405faf