From: Paul Sokolovsky <pmiscml@gmail.com>
Date: Sun, 7 Jan 2007 15:04:35 +0000 (+0000)
Subject: merge of '18d4581dca99c8e61139671a08cebbf98f7a7f1a'
X-Git-Tag: Release-2010-05/1~9435
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f6a40600630cfc3a27720eebf6c6afb9f462fff2;p=openembedded.git

Merge ... '18d4581dca99c8e61139671a08cebbf98f7a7f1a'
     and '2b6814f21f9de4de32873a38a5c277fc38317415'
---

f6a40600630cfc3a27720eebf6c6afb9f462fff2