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

[lfield]

commit c05a835dc69f8797f495927cf52ac1fdfcf53823
Merge: b7c4a6b 892a924
Author: lfield <Laurence.Field at cern.ch>
Date:   Thu Feb 9 11:49:36 2012 +0100

    Merge branch 'master' into f16
    
    Conflicts:
    	bdii.spec
    	sources

 bdii.spec |    8 ++++++--
 sources   |    3 ++-
 2 files changed, 8 insertions(+), 3 deletions(-)
---
diff --cc sources
index c46ffad,0558836..00bf21b
--- a/sources
+++ b/sources
@@@ -1,1 -1,1 +1,2 @@@
- a57f90b32d72cf4f5bdc00746c44f282  bdii-5.2.7.tar.gz
+ 3d5b232f10d61152e350d4a3c09960f8  bdii-5.2.8.tar.gz
++