[SCM] TANGO distributed control system. branch, dfsg_clean, updated. upstream/7.2.1a-17-gb8e254d

[Frédéric-Emmanuel PICCA]

The following commit has been merged in the dfsg_clean branch:
commit 4e18a1ab15884285e94dead11e36b534f29bcc74
Merge: 8ba63d49b0cfa82d4f04cfafef3b228d43d254d0 2f28080b5ff1b433cda39ee74a754d572cff8763
Author: Frédéric-Emmanuel PICCA <picca at synchrotron-soleil.fr>
Date:   Mon Dec 13 15:54:02 2010 +0100

    Merge branch 'upstream' into dfsg_clean
    
    Conflicts:
    	lib/java/Jive-4.17.jar
    	lib/java/org.tango.pogo-7.0.1.jar


-- 
TANGO distributed control system.