Merge branch 'blocked-as-special-property'
commite690ae7eb016f5635d706a681d158e4d2d1bc3c7
authorCarsten Dominik <carsten.dominik@gmail.com>
Fri, 18 Dec 2009 09:54:37 +0000 (18 10:54 +0100)
committerCarsten Dominik <carsten.dominik@gmail.com>
Fri, 18 Dec 2009 09:54:37 +0000 (18 10:54 +0100)
tree46d97ae0ffe16882ca4b06e67edf38267be5ada5
parent1886c46d9d7b68559b0ba142c828d2c054bf6321
parentb8e0d6fdb41f2165d675e89fcb54b741c971f6f4
Merge branch 'blocked-as-special-property'