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

Trivial merge