Merge branch 'master' of ssh://ooark.git.sf.net/gitroot/oooark/dronegcs
Authored by: James Goppert 2010-11-07
Parents: [7f850e][97b691]