Merge branch 'AD'
authorhristov <Peter.Hristov@cern.ch>
Wed, 15 Jan 2014 18:01:07 +0000 (19:01 +0100)
committerhristov <Peter.Hristov@cern.ch>
Wed, 15 Jan 2014 18:01:07 +0000 (19:01 +0100)

Trivial merge