[#6464] Fixed issues from rebase
Signed-off-by: Cory Johns cjohns@slashdotmedia.com
Authored by: Cory Johns 2013-08-16
Parent(s): [a661fd]
Child(ren): [a01335]