From dbd9b9524b3e31e24438ccb17c671f734cea8cf7 Mon Sep 17 00:00:00 2001
From: Oliver Kowalke <oliver.kowalke@gmx.de>
Date: Fri, 30 Sep 2011 18:34:22 +0100
Subject: [PATCH] Merge branch 'context-dev' of
 git://gitorious.org/boost-dev/boost-dev into context-dev