Merge branch 'viafb-cleanup' into viafb-next
authorFlorian Tobias Schandinat <FlorianSchandinat@gmx.de>
Sun, 24 Apr 2011 13:17:09 +0000 (13:17 +0000)
committerFlorian Tobias Schandinat <FlorianSchandinat@gmx.de>
Sun, 24 Apr 2011 13:17:09 +0000 (13:17 +0000)

Trivial merge