minor change
Merge branch 'master' of github.com:tlamadon/mopt

Conflicts:
	examples/example-slices.r