Bump versions based on changes submitted during 2.6.21 merge window.
Signed-off-by: Jeff Garzik <jeff@garzik.org>