From: Philipp Zabel <philipp.zabel@gmail.com>
Date: Thu, 20 Mar 2008 16:23:30 +0000 (+0000)
Subject: merge of '411e1889fa68a7d9f1fbfbfd00522a1e50051dcb'
X-Git-Tag: Release-2010-05/1~7299^2~10^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d5a54170c942d3d95eebb37fdeb3adf6cf881f94;p=openembedded.git

Merge ... '411e1889fa68a7d9f1fbfbfd00522a1e50051dcb'
     and 'c1f2a1f7dbe3e69fcd7448c9758a3a79555c74b9'
---

d5a54170c942d3d95eebb37fdeb3adf6cf881f94