Bugfix. Still broken on GCC 4.6.x due to compiler bug.