[#2689] Changes from code review.
Signed-off-by: Tim Van Steenburgh tvansteenburgh@geek.net
Authored by: Tim Van Steenburgh 2011-09-07
Committed by: Dave Brondsema 2011-09-08
Parent(s): [e3838d]
Child(ren): [c24b42]