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)
commit206807c60912334c2aca607569e4c25725c7660c
tree3f3c3831a22907a9f4e6183add687bb59bdc4dd3
parent93bcb22973e39a0ba88dd2e55c2cc8f25be27784
parent580599eee370eeb82f7ee1830cf21f352c793e36
Merge commit 'origin'