[bdii/f16: 2/2] Merge branch 'master' into f16

[lfield]

commit 49861239fbf353b53f2dfe1203da014dbde052a0
Merge: 7e36d45 04559df
Author: lfield <Laurence.Field at cern.ch>
Date:   Thu Mar 1 15:40:23 2012 +0100

    Merge branch 'master' into f16

 bdii.spec |    6 +++++-
 sources   |    2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)
---