Merge branch 'cl_roam'
authorRaphael Lisicki <raphael@ralisi.de>
Sat, 10 Apr 2010 19:43:44 +0000 (21:43 +0200)
committerRaphael Lisicki <raphael@ralisi.de>
Sat, 10 Apr 2010 19:43:44 +0000 (21:43 +0200)

Trivial merge