From: Paul Sokolovsky <pmiscml@gmail.com>
Date: Mon, 14 Jan 2008 22:24:42 +0000 (+0000)
Subject: merge of '2deed37a9e4e5e16ae13941b32c64a3fe7f89630'
X-Git-Tag: Release-2010-05/1~7921
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=188f616ebe2b39f1975f23f4029bbd09f0554102;p=openembedded.git

Merge ... '2deed37a9e4e5e16ae13941b32c64a3fe7f89630'
     and '685d383cf4795f34ac2470de61c67519695f99f1'
---

188f616ebe2b39f1975f23f4029bbd09f0554102