2014-04-09 lcg bundles by default
conflict resolved
Add LHCbVMDIRAC to the distribution
Merge pull request #1937 from atsareg/fix-v6r11

[v6r11] Minor fixes
v6r11 notes
Merge branch 'rel-v6r11' into rel-v6r12