Commit fee870b5d1f2a682f888787fdce308e567bdc6ab

Kano 2012-08-23T18:10:05

Merge remote-tracking branch 'conman/master'