[SCM] composite/master: Merge remote-tracking branch 'origin/master'

[alessio at users.alioth.debian.org]

Added menu file
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: b60da83335df3ab3e6ee46bbabc4e17a2c430841
X-Git-Newrev: fac453845eb37c8fff7905be23dfc61ce767fdbb

The following commit has been merged in the master branch:
commit fac453845eb37c8fff7905be23dfc61ce767fdbb
Merge: 88a7e0d235d0024475b856ed7f712e695d7a414a b60da83335df3ab3e6ee46bbabc4e17a2c430841
Author: Alessio Treglia <alessio at debian.org>
Date:   Mon Jan 9 20:33:24 2012 +0100

    Merge remote-tracking branch 'origin/master'


-- 
composite packaging