From: Paul Sokolovsky <pmiscml@gmail.com>
Date: Sun, 14 Jan 2007 10:01:19 +0000 (+0000)
Subject: merge of '6cd1d9371d3072edd062423937b327dceec39bbc'
X-Git-Tag: Release-2010-05/1~9372
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e92d2330ea630683ab95070a26eebd79a1029abd;p=openembedded.git

Merge ... '6cd1d9371d3072edd062423937b327dceec39bbc'
     and 'e9118e1c3f1bc5a110808561d9f9c3d0e58467bc'
---

e92d2330ea630683ab95070a26eebd79a1029abd