Joerg Mueller f0d5abfcb2 Merging trunk up to r39637.

2011-08-22 20:31:46 +00:00

..

modules

Merging trunk up to r39637.

2011-08-22 20:31:46 +00:00

presets

* Merging trunk up to r38981.

2011-08-03 12:44:52 +00:00

startup

Merging trunk up to r39637.

2011-08-22 20:31:46 +00:00

templates

pep8 edits and change '!= None' to 'is not None'

2011-08-22 09:01:49 +00:00