merge of 256698cb5e6bbc32343fd2d7b714517efc0e3d0c
authorOyvind Repvik <nail@nslu2-linux.org>
Tue, 14 Mar 2006 22:34:13 +0000 (22:34 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 14 Mar 2006 22:34:13 +0000 (22:34 +0000)
     and 27b9c5adc9f3c8d43d5702469feb4aef564a14c4


Trivial merge