Merge 74928 from /trunk
------------------------------------------------------------------------ r74928 | jhunold | 2011-10-12 19:59:21 +0200 (Mi, 12 Okt 2011) | 1 line
use boost workaround header for clang bug 6907 ------------------------------------------------------------------------