Conflicts: scikits/learn/datasets/base.py scikits/learn/gmm.py scikits/learn/hmm.py scikits/learn/pipeline.py