[SCM] TANGO distributed control system. tag, dfsg_clean/7.2.2+dfsg, updated. upstream/7.2.2-15-g694cdb9

[Picca Frédéric-Emmanuel]

The tag, dfsg_clean/7.2.2+dfsg has been updated
        to  694cdb951c7f21cdb259f68f6f048d49a90dbf01 (commit)
      from  b8e254d2ccca1abfa35bd27a45c7d8dabc239148

- Shortlog ------------------------------------------------------------
commit 694cdb951c7f21cdb259f68f6f048d49a90dbf01
Merge: 8ba63d4 26e777b
Author: Picca Frédéric-Emmanuel <picca at synchrotron-soleil.fr>
Date:   Thu Dec 16 14:48:00 2010 -0500

    Merge commit 'upstream/7.2.2'
    
    Conflicts:
    	lib/java/Jive-4.17.jar
    	lib/java/org.tango.pogo-7.0.2.jar

-----------------------------------------------------------------------

-- 
TANGO distributed control system.