Merge commit 'origin'
authorMalte S. Stretz <mss@apache.org>
Tue, 25 Aug 2009 22:01:58 +0000 (00:01 +0200)
committerMalte S. Stretz <mss@apache.org>
Tue, 25 Aug 2009 22:01:58 +0000 (00:01 +0200)

Trivial merge