Merge branch '1.0'

Authored by mwolff on Jun 11 2010, 9:06 PM.

Description

Merge branch '1.0'

Merged Changes

CommitAuthorDetailsCommitted
52c7609a63a2mwolff
prevent endless recursion 
Jun 11 2010
3fc23ef75a8asysadmin
SVN_SILENT made messages (.desktop file) 
Jun 10 2010
84d90241a1a1sysadmin
SVN_SILENT made messages (.desktop file) 
Jun 9 2010