Merge branch 'units-sortable'
authorMoritz Bunkus <m.bunkus@linet-services.de>
Wed, 11 May 2011 09:29:27 +0000 (11:29 +0200)
committerMoritz Bunkus <m.bunkus@linet-services.de>
Wed, 11 May 2011 09:29:27 +0000 (11:29 +0200)

Trivial merge