[Nagvis-checkins] SF.net Git: nagvis: Merge branch 'master' into zoom

[lars <la...@us...>]

Author:   Lars Michelsen <lm...@la...>
Date:     Sat Mar 31 13:33:12 2012 +0200
Committer:   Lars Michelsen <lm...@la...>
Commit-Date: Sat Mar 31 13:33:12 2012 +0200

Merge branch 'master' into zoom

Conflicts:
	share/frontend/nagvis-js/js/NagVisStatefulObject.js

---