[SCM] 2D CAD system branch, master, updated. debian/1.0.0_beta5-1-12-gdef3867

[Scott Howard]

The following commit has been merged in the master branch:
commit def38674dfa44b62e8afa2b362cec1bc2e7d9aea
Merge: 0517871b6716e897a6b010680ec600dfcf3255d4 d7004c107066e874b20c7d5249d84c6e28b76544
Author: Scott Howard <showard314 at gmail.com>
Date:   Mon Mar 7 22:48:10 2011 -0500

    Merge branches 'upstream' and 'master'


-- 
2D CAD system