merge of 0aba4d5c115b944af22e79b2d43f8d1848724fc2
authorOyvind Repvik <nail@nslu2-linux.org>
Tue, 2 Aug 2005 15:46:39 +0000 (15:46 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 2 Aug 2005 15:46:39 +0000 (15:46 +0000)
commite1d810e915c961d01100a697e9c077328048ffd4
treeb95a86025f4117220cd1669c0cdea86c82841ba6
parent4ae0c9e63f7ea08e9ad2b74bfc8b2781b5ceee08
parent2c2c957d5b8a09b6bbe1046d802eabf1fc621f59
merge of 0aba4d5c115b944af22e79b2d43f8d1848724fc2
     and 1aebe30c46f7b39a3a73dcd30e1227c1a403f1bd