From: Rod Whitby <rod@whitby.id.au>
Date: Sat, 1 Sep 2007 07:14:25 +0000 (+0000)
Subject: merge of '0805498f21dfb9d3fffd32b8f62fb01162ffc283'
X-Git-Tag: Release-2010-05/1~8770^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5556735505576918f0451b67a52f06cdf6c42da4;p=openembedded.git

Merge ... '0805498f21dfb9d3fffd32b8f62fb01162ffc283'
     and '89f3ef8f3c528f0223e26329df896a786c51ffae'
---

5556735505576918f0451b67a52f06cdf6c42da4