[merge] put back Option.short_name()

[Alexander Belchenko]

Alexander Belchenko has voted +1.
Status is now: Approved
Comment:


For details, see: 
http://bundlebuggy.aaronbentley.com/request/%3C20070112035910.GB13991%40gifted.local%3E