Merge remote-tracking branch 'bc/master' into tunnel

This commit is contained in:
Jehan Monnier 2011-08-25 15:48:22 +02:00
commit 0b2ebdf4ec

@ -1 +1 @@
Subproject commit f7bb65c20e8809708b74ab73658a9ea1e154c8f0
Subproject commit e933e1eae12b7f533ce354e11c234b899e2576cf