Merge branch 'viafb-aux' into viafb-next

This commit is contained in:
Florian Tobias Schandinat 2012-02-15 04:22:47 +00:00
commit 7b91812048
15 changed files with 736 additions and 10 deletions