From: Paul Sokolovsky <pmiscml@gmail.com>
Date: Sat, 9 Sep 2006 00:51:19 +0000 (+0000)
Subject: merge of '1997f387bbe1e6c453064b78bebac0eeaaa1dc02'
X-Git-Tag: Release-2010-05/1~9453^2~877^2~7
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=68ca6156e403400178816d99a7b8d53abfb4390d;p=openembedded.git

Merge ... '1997f387bbe1e6c453064b78bebac0eeaaa1dc02'
     and '2cc0e62b5fabb44bea5aaf3a8c0d61e75a2888ad'
---

68ca6156e403400178816d99a7b8d53abfb4390d