From: Rod Whitby <rod@whitby.id.au>
Date: Sat, 1 Dec 2007 14:46:35 +0000 (+0000)
Subject: merge of '7d861d6a945af531929902d5717003486976079d'
X-Git-Tag: Release-2010-05/1~8242
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=46c11035838a5bcf4b50385ebd549828be84a73e;p=openembedded.git

Merge ... '7d861d6a945af531929902d5717003486976079d'
     and 'e01f270130b45051b21882abdc8e136007852697'
---

46c11035838a5bcf4b50385ebd549828be84a73e