Dummy merge of 2.6 reversion of logging change

This commit is contained in:
Nick Coghlan 2011-03-13 21:52:31 +10:00
commit e10342533e

Diff content is not available