Merge remote-tracking branch 'BostjanOb/patch-1' into bostjan-patch
authorEvan Coury <me@evancoury.com>
Thu, 22 Dec 2011 14:07:33 +0000 (07:07 -0700)
committerEvan Coury <me@evancoury.com>
Thu, 22 Dec 2011 14:07:33 +0000 (07:07 -0700)

Trivial merge