merge changes from main
commit10f99397f6c2b9e012d2625c890677c9bb470f2c
authorStefano Costa <steko@iosa.it>
Sat, 25 Oct 2008 17:25:43 +0000 (25 19:25 +0200)
committerStefano Costa <steko@iosa.it>
Sat, 25 Oct 2008 17:25:43 +0000 (25 19:25 +0200)
treeee5464f8c465dfa775b27c6416025003426f362e
parentcb31ab6e6b93ef5dd94402e422185e12c29bae3f
parent8318c0e7c564f0466ef6c224a20c87c5cda4f79d
merge changes from main
totalopenstation-gui