[SCM] triplea packaging branch, master, updated. debian/1.5.2.1-1-4-gd547d70

[Scott Howard]

The following commit has been merged in the master branch:
commit 899d84b2f18a094e6ef2dc1819606baacb089597
Merge: aad90a867289cf980d471cd2d4e205ea079bc351 58e0877981778342b80b58e89252cf6e92714d60
Author: Scott Howard <showard314 at gmail.com>
Date:   Wed Dec 5 21:03:26 2012 -0500

    Merge tag 'upstream/1.6.1.2'
    
    Upstream version 1.6.1.2


-- 
triplea packaging