From: Richard Purdie <rpurdie@rpsys.net>
Date: Mon, 4 Jul 2005 22:27:41 +0000 (+0000)
Subject: merge of 041417bf35ad25ac46b7b36aa80c5aecc3f947c2
X-Git-Tag: Release-2010-05/1~9453^2~4233
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=904879ece7a2d48913c08f5b8c617dc676a0c0ba;p=openembedded.git

merge of 041417bf35ad25ac46b7b36aa80c5aecc3f947c2
     and 8f8edb0b14c6c17472c27e61765ff13f441ff89b
---

904879ece7a2d48913c08f5b8c617dc676a0c0ba