Commit 98d789bd93b5d1ff4e2f344bc4695011ec253442

Kano 2012-01-30T15:23:23

Merge remote-tracking branch 'conman/master'