merge of 145a49f1dd3bd0a8544ee768239eee3c5289dd3c
authorOyvind Repvik <nail@nslu2-linux.org>
Tue, 4 Apr 2006 22:30:33 +0000 (22:30 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 4 Apr 2006 22:30:33 +0000 (22:30 +0000)
     and 573d88b08d7646f2a69cbba7b8d4d7fcfd47fda2


Trivial merge