Merge branch '1.2'

Authored by mwolff on Jun 22 2011, 9:44 PM.

Description

Merge branch '1.2'

Merged Changes

CommitAuthorDetailsCommitted
b68398aa7cbdmwolff
make sure we don't crash on (broken?) declarations without internal context in… 
Jun 22 2011