From: Philip Balister <philip@balister.org>
Date: Wed, 23 May 2007 14:28:29 +0000 (+0000)
Subject: merge of '3ff3791f6f88919a909fbe4ecd9ea923278b08e6'
X-Git-Tag: Release-2010-05/1~8868^2~400^2~179^2~8^2~7
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=19faf778716ead2ff683b4a79af61939c3ff18e9;p=openembedded.git

Merge ... '3ff3791f6f88919a909fbe4ecd9ea923278b08e6'
     and '6e33c7fc6b6fce6ae3708fa63940a13147ac87e3'
---

19faf778716ead2ff683b4a79af61939c3ff18e9