Revision 0374ec87a926189741c19c81fce2e7c01687929f

Committed on 05/12/2011 3:49 am by svda <[email protected]> [GitHub Diff]

Fixed merge conflict.