From: Paul Sokolovsky <pmiscml@gmail.com>
Date: Sat, 30 Dec 2006 01:58:00 +0000 (+0000)
Subject: merge of '6b7f9cf3f65ad039a833daa763ba3ce580f1bda3'
X-Git-Tag: Release-2010-05/1~9453^2~81
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ad4e12fab01540a845d060daa76bd0d87b78126f;p=openembedded.git

Merge ... '6b7f9cf3f65ad039a833daa763ba3ce580f1bda3'
     and 'd9ff8154bdbed8a35446daf4b69085bc98be843b'
---

ad4e12fab01540a845d060daa76bd0d87b78126f