backout merge, bug 633219
commit8e1bccaebaf8fec0c8e26d9f89cbccb7e50e40f4
authorIgor Bukanov <igor@mir2.org>
Thu, 17 Feb 2011 18:39:42 +0000 (17 19:39 +0100)
committerIgor Bukanov <igor@mir2.org>
Thu, 17 Feb 2011 18:39:42 +0000 (17 19:39 +0100)
tree8de4c748cff185967397b46cdef4c460a6a057bd
parentfe3142e32447eb3e1e3b92f6ef5293f70148d9b7
parentb182fe673a6d3566683b494b4107be0f8660196d
backout merge, bug 633219