Merge of branch dev-148932 (Admin GUI - Minimal Cleanup) to trunk
Authored by: bbranan 2008-06-05
Parent: [r7251]
Child: [r7253]