From: Philip Balister <philip@balister.org>
Date: Sat, 29 Sep 2007 20:44:56 +0000 (+0000)
Subject: merge of '912a4116b92071ce99e54525b89d7f94cbdb6b0e'
X-Git-Tag: Release-2010-05/1~8549^2~1^2~128^2~11^2~24^2~19
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c3363dee6e7b3b2f21bd8f7b5d0951fd3fc268b1;p=openembedded.git

Merge ... '912a4116b92071ce99e54525b89d7f94cbdb6b0e'
     and 'c512da70bbe567d82698163abd63d820c8a3c9fa'
---

c3363dee6e7b3b2f21bd8f7b5d0951fd3fc268b1