Makefile.dep updated.
Merge remote-tracking branch 'antirez/2.6' into 2.6