Dan Williams e2f82f02a0 Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar ... Conflicts: shell/view/home/IconLayout.py		2006-09-24 21:37:46 -04:00
..
simulator
test-grid.py
test-icon-layout.py
test-icons.py
test-theme.py