Merge branch 'master' of github.com:dpavlin/bak-git
authorDobrica Pavlinusic <dpavlin@rot13.org>
Tue, 4 May 2010 08:32:14 +0000 (10:32 +0200)
committerDobrica Pavlinusic <dpavlin@rot13.org>
Tue, 4 May 2010 08:32:14 +0000 (10:32 +0200)

Trivial merge