From: Rod Whitby <rod@whitby.id.au>
Date: Fri, 7 Sep 2007 21:27:53 +0000 (+0000)
Subject: merge of '5198d0edcd376472b37b08e632a08466f101c570'
X-Git-Tag: Release-2010-05/1~8701^2~8^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=25eeb065fb156d376960420f1ea7879f3a2880ee;p=openembedded.git

Merge ... '5198d0edcd376472b37b08e632a08466f101c570'
     and '83398e1336b5456cc5a8661377b3819a02cc3ba2'
---

25eeb065fb156d376960420f1ea7879f3a2880ee