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)
commitc54806e853b63e1d43e1dc1fc1ac5413ffb52ac2
treee3d77dfad8b161f72d9137dfd61e991345862773
parent71aef36731d6fd25f3fb41f981e4c6a64bc590ce
parent4d7864b69c443fa8810bc6407d160e994b75ac67
merge of 5de21ce1146b76cf25440eddc66aaa8a9a984df9
     and dfcb7791f0a796aab00f40b7918a67f5022f1d07