Merge pull request #535 from sslavic/patch-2. Closes #535.

Fixed typo in scaladoc

Author: Stevo Slavić <sslavic@gmail.com>

== Merge branch commits ==

commit 0a77f789e281930f4168543cc0d3b3ffbf5b3764
Author: Stevo Slavić <sslavic@gmail.com>
Date:   Tue Feb 4 15:30:27 2014 +0100

    Fixed typo in scaladoc

(cherry picked from commit 0c05cd374dac309b5444980f10f8dcb820c752c2)
Signed-off-by: Reynold Xin <rxin@apache.org>
Merge pull request #534 from sslavic/patch-1. Closes #534.

Fixed wrong path to compute-classpath.cmd

compute-classpath.cmd is in bin, not in sbin directory

Author: Stevo Slavić <sslavic@gmail.com>

== Merge branch commits ==

commit 23deca32b69e9429b33ad31d35b7e1bfc9459f59
Author: Stevo Slavić <sslavic@gmail.com>
Date:   Tue Feb 4 15:01:47 2014 +0100

    Fixed wrong path to compute-classpath.cmd

    compute-classpath.cmd is in bin, not in sbin directory

(cherry picked from commit 92092879c3b8001a456fefc2efc0df16585515a8)
Signed-off-by: Reynold Xin <rxin@apache.org>