From fc0ea7165e1694253e589f6ef7a9a3fd7821239f Mon Sep 17 00:00:00 2001
From: Oliver Kowalke <oliver.kowalke@gmx.de>
Date: Mon, 14 Nov 2011 21:38:04 +0000
Subject: [PATCH] Merge branch 'context-dev' of
 git@gitorious.org:boost-dev/boost-dev into context-dev