From: Paul Sokolovsky <pmiscml@gmail.com>
Date: Mon, 28 Jan 2008 00:12:34 +0000 (+0000)
Subject: merge of '2b629c70f36efd84d9157bcab5d582d59fa8258e'
X-Git-Tag: Release-2010-05/1~7829^2~11^2~5
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3e3426a943c22b95ca15c1c9b72c47502ecc4e28;p=openembedded.git

Merge ... '2b629c70f36efd84d9157bcab5d582d59fa8258e'
     and 'a99dc9b34551aa3889d7057538bf2e37b0471af1'
---

3e3426a943c22b95ca15c1c9b72c47502ecc4e28