Merge branch 'windows'
authorSam Thursfield <samthursfield@codethink.co.uk>
Mon, 23 May 2011 14:26:54 +0000 (15:26 +0100)
committerSam Thursfield <samthursfield@codethink.co.uk>
Mon, 23 May 2011 14:26:54 +0000 (15:26 +0100)
commit4517574e0a64bd51bca54a983a50428b615940f6
treea4c98781394e1aecabd3bc4fff47154c39e02e50
parentab2a8110aef03f777ef9aa978d2d57fc3b1ca48c
parent96c6c06cc47a840411e1fbf3130513fd25441f05
Merge branch 'windows'