Merge branch 'mi/181'
Authored by: Max Ischenko 2010-04-28
Parent(s): [621884][e6e6f3]
Child(ren): [45383d]