From: Rod Whitby <rod@whitby.id.au>
Date: Sun, 23 Sep 2007 13:52:07 +0000 (+0000)
Subject: merge of '506b85082c41d0d7ce9fd08a712622475cfcc48d'
X-Git-Tag: Release-2010-05/1~8616^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=26cf80b3ffb0a3612b3a1116afd05e5b2ebb6917;p=openembedded.git

Merge ... '506b85082c41d0d7ce9fd08a712622475cfcc48d'
     and '7068e31d13e1006027e2fa9ad5f9b3887c570b94'
---

26cf80b3ffb0a3612b3a1116afd05e5b2ebb6917