]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'master' of git://github.com/cyrillos/vm
authorPekka Enberg <penberg@cs.helsinki.fi>
Sun, 11 Apr 2010 18:07:45 +0000 (21:07 +0300)
committerPekka Enberg <penberg@cs.helsinki.fi>
Sun, 11 Apr 2010 18:07:45 +0000 (21:07 +0300)

Trivial merge