From: Paul Sokolovsky <pmiscml@gmail.com>
Date: Wed, 6 Feb 2008 16:38:07 +0000 (+0000)
Subject: merge of '04d71b254a1cb165a6dab2688fc19c937e10afc5'
X-Git-Tag: Release-2010-05/1~7713^2~41^2^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=971d3c239dcb1fbd91f4dc3a5a0ff22fd31f676b;p=openembedded.git

Merge ... '04d71b254a1cb165a6dab2688fc19c937e10afc5'
     and '3db1a7f8ffb636e2a0489fd213705447a66fd326'
---

971d3c239dcb1fbd91f4dc3a5a0ff22fd31f676b