Merge commit 'index-wt~2' of git://repo.or.cz/topgit/bertw
authorUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Sun, 26 Dec 2010 12:20:26 +0000 (26 13:20 +0100)
committerUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Sun, 26 Dec 2010 12:20:37 +0000 (26 13:20 +0100)

Trivial merge