Merge branch 'planetlab/master'
authorS.Çağlar Onur <caglar@verivue.com>
Mon, 11 Jul 2011 02:15:55 +0000 (22:15 -0400)
committerS.Çağlar Onur <caglar@verivue.com>
Mon, 11 Jul 2011 02:15:55 +0000 (22:15 -0400)
commitd996e9e16a8250467145f4520785f01cb82604fb
tree5e09a76c0779ae5d63fd158924d179c03a5b32b9
parentf0ee9aec49d34412aeb22ab01bee64fee7abe7c4
parentc613ca8824b9dc513c22b4566ec717dfcda68f9f
Merge branch 'planetlab/master'

Conflicts:
coblitz-latest-tags.mk
coblitz-latest-tags.mk
module-tools.py