merge of 0185cf2d013d2c0935d8f930c1bd794ff7d2defe
authorOyvind Repvik <nail@nslu2-linux.org>
Tue, 4 Apr 2006 22:18:34 +0000 (22:18 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 4 Apr 2006 22:18:34 +0000 (22:18 +0000)
commitf4a5b841e19e837dac070efe79fcd17f859c797c
tree14fec5cfc0093b2699c2de9aa26a759f4c99b3be
parent0db59878d57881f15f4c65363f103cd3cc322625
parentf6d5785f33bcec280086c2e5fbd8bee727578f74
merge of 0185cf2d013d2c0935d8f930c1bd794ff7d2defe
     and ab41e679a9bfc6bc2294e34b63fd70a9ef105ead