Klemen Košir - 2011-11-24

File to patch using SVN revision 2334.