Merge branch 'viafb-olpc' into viafb-next

This commit is contained in:
Florian Tobias Schandinat 2011-04-24 13:16:41 +00:00
commit 567b99f84e
3 changed files with 8 additions and 2 deletions