Merge branch 'dev' into tv/4142
Signed-off-by: Tim Van Steenburgh tvansteenburgh@gmail.com
Authored by: Tim Van Steenburgh 2012-06-22
Parent(s): [c4f76a][e56345]
Child(ren): [d13b9c]