From: John Bowler <jbowler@nslu2-linux.org>
Date: Mon, 9 Jan 2006 19:23:03 +0000 (+0000)
Subject: merge of 45134ada52bf69aa376e98002657a0c130e6ff44
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1bcc930ec17ed96e7c55aa925af6dfa367ebc2c0;p=openembedded.git

merge of 45134ada52bf69aa376e98002657a0c130e6ff44
     and 77ee5dc366bb987ffa1f3267250d243a17292002
---

1bcc930ec17ed96e7c55aa925af6dfa367ebc2c0