merge of 5de21ce1146b76cf25440eddc66aaa8a9a984df9
authorOyvind Repvik <nail@nslu2-linux.org>
Sat, 11 Mar 2006 20:36:44 +0000 (20:36 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 11 Mar 2006 20:36:44 +0000 (20:36 +0000)
     and dfcb7791f0a796aab00f40b7918a67f5022f1d07


Trivial merge