From: Oyvind Repvik <nail@nslu2-linux.org>
Date: Tue, 4 Apr 2006 22:30:33 +0000 (+0000)
Subject: merge of 145a49f1dd3bd0a8544ee768239eee3c5289dd3c
X-Git-Tag: Release-2010-05/1~9453^2~2095
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b0dc6fef1b459e131f1b17336e3a099b1ad5250e;p=openembedded.git

merge of 145a49f1dd3bd0a8544ee768239eee3c5289dd3c
     and 573d88b08d7646f2a69cbba7b8d4d7fcfd47fda2
---

b0dc6fef1b459e131f1b17336e3a099b1ad5250e