From: Todd Blumer <todd@sdgsystems.com>
Date: Fri, 20 Jul 2007 20:12:53 +0000 (+0000)
Subject: merge of '67dbe8b946b7e61ce8c584272ff315f0a7b698d2'
X-Git-Tag: Release-2010-05/1~8868^2~120^2~4^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f90aa451f20fc5132794c5d0d40c93a943271894;p=openembedded.git

Merge ... '67dbe8b946b7e61ce8c584272ff315f0a7b698d2'
     and '7d9e3c0371703df6cb39dcdb41d1d9131946eb1e'
---

f90aa451f20fc5132794c5d0d40c93a943271894