merge from planetlab/master
authorBaris Metin <bmetin@verivue.com>
Fri, 6 May 2011 14:20:34 +0000 (10:20 -0400)
committerBaris Metin <bmetin@verivue.com>
Fri, 6 May 2011 14:20:34 +0000 (10:20 -0400)

Trivial merge