[Qemu-trivial] [PATCH trivial] Fix comment typos in hw/armv7m.c

[Qemu-trivial] [PATCH trivial] Fix comment typos in hw/armv7m.c

[Matthew Fernandez]

Fix a couple of typos in comments.

Signed-off-by: Matthew Fernandez <matthew.fernandez@gmail.com>
----
This patch doesn't touch any code and should (hopefully) not be
controversial. There doesn't seem to be a maintainer for this file,
but changes are trivial.


diff --git a/hw/armv7m.c b/hw/armv7m.c
index 72d010a..83f3393 100644
--- a/hw/armv7m.c
+++ b/hw/armv7m.c
@@ -4,7 +4,7 @@
  * Copyright (c) 2006-2007 CodeSourcery.
  * Written by Paul Brook
  *
- * This code is licenced under the GPL.
+ * This code is licensed under the GPL.
  */

 #include "sysbus.h"
@@ -14,7 +14,7 @@

 /* Bitbanded IO.  Each word corresponds to a single bit.  */

-/* Get the byte address of the real memory for a bitband acess.  */
+/* Get the byte address of the real memory for a bitband access.  */
 static inline uint32_t bitband_addr(void * opaque, uint32_t addr)
 {
     uint32_t res;

[Qemu-devel] [PATCH trivial] Fix comment typos in hw/armv7m.c

[Matthew Fernandez]

Fix a couple of typos in comments.

Signed-off-by: Matthew Fernandez <matthew.fernandez@gmail.com>
----
This patch doesn't touch any code and should (hopefully) not be
controversial. There doesn't seem to be a maintainer for this file,
but changes are trivial.


diff --git a/hw/armv7m.c b/hw/armv7m.c
index 72d010a..83f3393 100644
--- a/hw/armv7m.c
+++ b/hw/armv7m.c
@@ -4,7 +4,7 @@
  * Copyright (c) 2006-2007 CodeSourcery.
  * Written by Paul Brook
  *
- * This code is licenced under the GPL.
+ * This code is licensed under the GPL.
  */

 #include "sysbus.h"
@@ -14,7 +14,7 @@

 /* Bitbanded IO.  Each word corresponds to a single bit.  */

-/* Get the byte address of the real memory for a bitband acess.  */
+/* Get the byte address of the real memory for a bitband access.  */
 static inline uint32_t bitband_addr(void * opaque, uint32_t addr)
 {
     uint32_t res;

Re: [Qemu-trivial] [Qemu-devel] [PATCH trivial] Fix comment typos in hw/armv7m.c

[Stefan Weil]

Am 23.06.2011 02:59, schrieb Matthew Fernandez:
> Fix a couple of typos in comments.
>
> Signed-off-by: Matthew Fernandez<matthew.fernandez@gmail.com>
> ----
> This patch doesn't touch any code and should (hopefully) not be
> controversial. There doesn't seem to be a maintainer for this file,
> but changes are trivial.
>
>
> diff --git a/hw/armv7m.c b/hw/armv7m.c
> index 72d010a..83f3393 100644
> --- a/hw/armv7m.c
> +++ b/hw/armv7m.c
> @@ -4,7 +4,7 @@
>    * Copyright (c) 2006-2007 CodeSourcery.
>    * Written by Paul Brook
>    *
> - * This code is licenced under the GPL.
> + * This code is licensed under the GPL.
>    */
>
>   #include "sysbus.h"
> @@ -14,7 +14,7 @@
>
>   /* Bitbanded IO.  Each word corresponds to a single bit.  */
>
> -/* Get the byte address of the real memory for a bitband acess.  */
> +/* Get the byte address of the real memory for a bitband access.  */
>   static inline uint32_t bitband_addr(void * opaque, uint32_t addr)
>   {
>       uint32_t res;


Acked-by: Stefan Weil <weil@mail.berlios.de>


Hi,

would you mind sending a patch which fixes all other "licenced", too?
There are 65 files which contain this spelling :-)

Cheers,
Stefan W.

Re: [Qemu-devel] [PATCH trivial] Fix comment typos in hw/armv7m.c

[Stefan Weil]

Am 23.06.2011 02:59, schrieb Matthew Fernandez:
> Fix a couple of typos in comments.
>
> Signed-off-by: Matthew Fernandez<matthew.fernandez@gmail.com>
> ----
> This patch doesn't touch any code and should (hopefully) not be
> controversial. There doesn't seem to be a maintainer for this file,
> but changes are trivial.
>
>
> diff --git a/hw/armv7m.c b/hw/armv7m.c
> index 72d010a..83f3393 100644
> --- a/hw/armv7m.c
> +++ b/hw/armv7m.c
> @@ -4,7 +4,7 @@
>    * Copyright (c) 2006-2007 CodeSourcery.
>    * Written by Paul Brook
>    *
> - * This code is licenced under the GPL.
> + * This code is licensed under the GPL.
>    */
>
>   #include "sysbus.h"
> @@ -14,7 +14,7 @@
>
>   /* Bitbanded IO.  Each word corresponds to a single bit.  */
>
> -/* Get the byte address of the real memory for a bitband acess.  */
> +/* Get the byte address of the real memory for a bitband access.  */
>   static inline uint32_t bitband_addr(void * opaque, uint32_t addr)
>   {
>       uint32_t res;


Acked-by: Stefan Weil <weil@mail.berlios.de>


Hi,

would you mind sending a patch which fixes all other "licenced", too?
There are 65 files which contain this spelling :-)

Cheers,
Stefan W.

Re: [Qemu-trivial] [Qemu-devel] [PATCH trivial] Fix comment typos in hw/armv7m.c

[Matthew Fernandez]

[-- Attachment #1: Type: text/plain, Size: 1463 bytes --]

----- Original message -----
> Am 23.06.2011 02:59, schrieb Matthew Fernandez:
> > Fix a couple of typos in comments.
> > 
> > Signed-off-by: Matthew Fernandez<matthew.fernandez@gmail.com>
> > ----
> > This patch doesn't touch any code and should (hopefully) not be
> > controversial. There doesn't seem to be a maintainer for this file,
> > but changes are trivial.
> > 
> > 
> > diff --git a/hw/armv7m.c b/hw/armv7m.c
> > index 72d010a..83f3393 100644
> > --- a/hw/armv7m.c
> > +++ b/hw/armv7m.c
> > @@ -4,7 +4,7 @@
> > * Copyright (c) 2006-2007 CodeSourcery.
> > * Written by Paul Brook
> > *
> > - * This code is licenced under the GPL.
> > + * This code is licensed under the GPL.
> > */
> > 
> > #include "sysbus.h"
> > @@ -14,7 +14,7 @@
> > 
> > /* Bitbanded IO.   Each word corresponds to a single bit.   */
> > 
> > -/* Get the byte address of the real memory for a bitband acess.   */
> > +/* Get the byte address of the real memory for a bitband access.   */
> > static inline uint32_t bitband_addr(void * opaque, uint32_t addr)
> > {
> > uint32_t res;
> 
> 
> Acked-by: Stefan Weil <weil@mail.berlios.de>
> 
> 
> Hi,
> 
> would you mind sending a patch which fixes all other "licenced", too?
> There are 65 files which contain this spelling :-)
> 
> Cheers,
> Stefan W.
> 
No problem. Are there any objections to this being a single patch? Don't really fancy sending 40+ patches. Obviously it will touch a lot of files, but won't change any code.

[-- Attachment #2: Type: text/html, Size: 2308 bytes --]

Re: [Qemu-devel] [PATCH trivial] Fix comment typos in hw/armv7m.c

[Matthew Fernandez]

[-- Attachment #1: Type: text/plain, Size: 1463 bytes --]

----- Original message -----
> Am 23.06.2011 02:59, schrieb Matthew Fernandez:
> > Fix a couple of typos in comments.
> > 
> > Signed-off-by: Matthew Fernandez<matthew.fernandez@gmail.com>
> > ----
> > This patch doesn't touch any code and should (hopefully) not be
> > controversial. There doesn't seem to be a maintainer for this file,
> > but changes are trivial.
> > 
> > 
> > diff --git a/hw/armv7m.c b/hw/armv7m.c
> > index 72d010a..83f3393 100644
> > --- a/hw/armv7m.c
> > +++ b/hw/armv7m.c
> > @@ -4,7 +4,7 @@
> > * Copyright (c) 2006-2007 CodeSourcery.
> > * Written by Paul Brook
> > *
> > - * This code is licenced under the GPL.
> > + * This code is licensed under the GPL.
> > */
> > 
> > #include "sysbus.h"
> > @@ -14,7 +14,7 @@
> > 
> > /* Bitbanded IO.   Each word corresponds to a single bit.   */
> > 
> > -/* Get the byte address of the real memory for a bitband acess.   */
> > +/* Get the byte address of the real memory for a bitband access.   */
> > static inline uint32_t bitband_addr(void * opaque, uint32_t addr)
> > {
> > uint32_t res;
> 
> 
> Acked-by: Stefan Weil <weil@mail.berlios.de>
> 
> 
> Hi,
> 
> would you mind sending a patch which fixes all other "licenced", too?
> There are 65 files which contain this spelling :-)
> 
> Cheers,
> Stefan W.
> 
No problem. Are there any objections to this being a single patch? Don't really fancy sending 40+ patches. Obviously it will touch a lot of files, but won't change any code.

[-- Attachment #2: Type: text/html, Size: 2308 bytes --]

Re: [Qemu-trivial] [Qemu-devel] [PATCH trivial] Fix comment typos in hw/armv7m.c

[Stefan Weil]

[-- Attachment #1: Type: text/plain, Size: 1513 bytes --]

Am 23.06.2011 10:08, schrieb Matthew Fernandez:
>
> ----- Original message -----
> > Am 23.06.2011 02:59, schrieb Matthew Fernandez:
> > > Fix a couple of typos in comments.
> > >
> > > Signed-off-by: Matthew Fernandez<matthew.fernandez@gmail.com 
> <mailto:matthew.fernandez@gmail.com>>
> > > ----
> > > This patch doesn't touch any code and should (hopefully) not be
> > > controversial. There doesn't seem to be a maintainer for this file,
> > > but changes are trivial.
> > >
> > >
> > > diff --git a/hw/armv7m.c b/hw/armv7m.c
> > > index 72d010a..83f3393 100644
> > > --- a/hw/armv7m.c
> > > +++ b/hw/armv7m.c
> > > @@ -4,7 +4,7 @@
> > > * Copyright (c) 2006-2007 CodeSourcery.
> > > * Written by Paul Brook
> > > *
> > > - * This code is licenced under the GPL.
> > > + * This code is licensed under the GPL.
> > > */
> > >
>
...
>
> ...
> >
> >
> > Acked-by: Stefan Weil <weil@mail.berlios.de 
> <mailto:weil@mail.berlios.de>>
> >
> >
> > Hi,
> >
> > would you mind sending a patch which fixes all other "licenced", too?
> > There are 65 files which contain this spelling :-)
> >
> > Cheers,
> > Stefan W.
> >
> No problem. Are there any objections to this being a single patch? 
> Don't really fancy sending 40+ patches. Obviously it will touch a lot 
> of files, but won't change any code.
>

I think a single patch is ok for this special case.
All "licenced" are part of (L)GPL license comments with a very low risk 
of merge conflicts,
especially if the patch is accepted and applied soon.

Stefan W.


[-- Attachment #2: Type: text/html, Size: 2425 bytes --]

Re: [Qemu-devel] [PATCH trivial] Fix comment typos in hw/armv7m.c

[Stefan Weil]

[-- Attachment #1: Type: text/plain, Size: 1513 bytes --]

Am 23.06.2011 10:08, schrieb Matthew Fernandez:
>
> ----- Original message -----
> > Am 23.06.2011 02:59, schrieb Matthew Fernandez:
> > > Fix a couple of typos in comments.
> > >
> > > Signed-off-by: Matthew Fernandez<matthew.fernandez@gmail.com 
> <mailto:matthew.fernandez@gmail.com>>
> > > ----
> > > This patch doesn't touch any code and should (hopefully) not be
> > > controversial. There doesn't seem to be a maintainer for this file,
> > > but changes are trivial.
> > >
> > >
> > > diff --git a/hw/armv7m.c b/hw/armv7m.c
> > > index 72d010a..83f3393 100644
> > > --- a/hw/armv7m.c
> > > +++ b/hw/armv7m.c
> > > @@ -4,7 +4,7 @@
> > > * Copyright (c) 2006-2007 CodeSourcery.
> > > * Written by Paul Brook
> > > *
> > > - * This code is licenced under the GPL.
> > > + * This code is licensed under the GPL.
> > > */
> > >
>
...
>
> ...
> >
> >
> > Acked-by: Stefan Weil <weil@mail.berlios.de 
> <mailto:weil@mail.berlios.de>>
> >
> >
> > Hi,
> >
> > would you mind sending a patch which fixes all other "licenced", too?
> > There are 65 files which contain this spelling :-)
> >
> > Cheers,
> > Stefan W.
> >
> No problem. Are there any objections to this being a single patch? 
> Don't really fancy sending 40+ patches. Obviously it will touch a lot 
> of files, but won't change any code.
>

I think a single patch is ok for this special case.
All "licenced" are part of (L)GPL license comments with a very low risk 
of merge conflicts,
especially if the patch is accepted and applied soon.

Stefan W.


[-- Attachment #2: Type: text/html, Size: 2425 bytes --]

Re: [Qemu-trivial] [Qemu-devel] [PATCH trivial] Fix comment typos in hw/armv7m.c

[Andreas Färber]

Am 23.06.2011 um 02:59 schrieb Matthew Fernandez:

> Fix a couple of typos in comments.
>
> Signed-off-by: Matthew Fernandez <matthew.fernandez@gmail.com>
> ----
> This patch doesn't touch any code and should (hopefully) not be
> controversial. There doesn't seem to be a maintainer for this file,
> but changes are trivial.
>
>
> diff --git a/hw/armv7m.c b/hw/armv7m.c
> index 72d010a..83f3393 100644
> --- a/hw/armv7m.c
> +++ b/hw/armv7m.c
> @@ -4,7 +4,7 @@
>  * Copyright (c) 2006-2007 CodeSourcery.
>  * Written by Paul Brook
>  *
> - * This code is licenced under the GPL.
> + * This code is licensed under the GPL.

Nack. Licence is British English, license American English. It's not  
wrong.

>  */
>
> #include "sysbus.h"
> @@ -14,7 +14,7 @@
>
> /* Bitbanded IO.  Each word corresponds to a single bit.  */
>
> -/* Get the byte address of the real memory for a bitband acess.  */
> +/* Get the byte address of the real memory for a bitband access.  */

This one's okay.

Andreas

> static inline uint32_t bitband_addr(void * opaque, uint32_t addr)
> {
>     uint32_t res;
>

Re: [Qemu-devel] [PATCH trivial] Fix comment typos in hw/armv7m.c

[Andreas Färber]

Am 23.06.2011 um 02:59 schrieb Matthew Fernandez:

> Fix a couple of typos in comments.
>
> Signed-off-by: Matthew Fernandez <matthew.fernandez@gmail.com>
> ----
> This patch doesn't touch any code and should (hopefully) not be
> controversial. There doesn't seem to be a maintainer for this file,
> but changes are trivial.
>
>
> diff --git a/hw/armv7m.c b/hw/armv7m.c
> index 72d010a..83f3393 100644
> --- a/hw/armv7m.c
> +++ b/hw/armv7m.c
> @@ -4,7 +4,7 @@
>  * Copyright (c) 2006-2007 CodeSourcery.
>  * Written by Paul Brook
>  *
> - * This code is licenced under the GPL.
> + * This code is licensed under the GPL.

Nack. Licence is British English, license American English. It's not  
wrong.

>  */
>
> #include "sysbus.h"
> @@ -14,7 +14,7 @@
>
> /* Bitbanded IO.  Each word corresponds to a single bit.  */
>
> -/* Get the byte address of the real memory for a bitband acess.  */
> +/* Get the byte address of the real memory for a bitband access.  */

This one's okay.

Andreas

> static inline uint32_t bitband_addr(void * opaque, uint32_t addr)
> {
>     uint32_t res;
>

Re: [Qemu-trivial] [Qemu-devel] [PATCH trivial] Fix comment typos in hw/armv7m.c

[Matthew Fernandez]

[-- Attachment #1: Type: text/plain, Size: 1515 bytes --]

On 23 June 2011 20:22, Andreas Färber <andreas.faerber@web.de> wrote:

> Am 23.06.2011 um 02:59 schrieb Matthew Fernandez:
>
>
>  Fix a couple of typos in comments.
>>
>> Signed-off-by: Matthew Fernandez <matthew.fernandez@gmail.com>
>> ----
>> This patch doesn't touch any code and should (hopefully) not be
>> controversial. There doesn't seem to be a maintainer for this file,
>> but changes are trivial.
>>
>>
>> diff --git a/hw/armv7m.c b/hw/armv7m.c
>> index 72d010a..83f3393 100644
>> --- a/hw/armv7m.c
>> +++ b/hw/armv7m.c
>> @@ -4,7 +4,7 @@
>>  * Copyright (c) 2006-2007 CodeSourcery.
>>  * Written by Paul Brook
>>  *
>> - * This code is licenced under the GPL.
>> + * This code is licensed under the GPL.
>>
>
> Nack. Licence is British English, license American English. It's not wrong.

Licence is the noun in British English, while license in the noun in
American English. License is the correct verb in both. Nevertheless, I don't
think this is worth debating. If there's dissent I'm happy to drop the first
part of the patch.

>
>
>   */
>>
>> #include "sysbus.h"
>> @@ -14,7 +14,7 @@
>>
>> /* Bitbanded IO.  Each word corresponds to a single bit.  */
>>
>> -/* Get the byte address of the real memory for a bitband acess.  */
>> +/* Get the byte address of the real memory for a bitband access.  */
>>
>
> This one's okay.
>
> Andreas
>
>
>  static inline uint32_t bitband_addr(void * opaque, uint32_t addr)
>> {
>>    uint32_t res;
>>
>>
>

[-- Attachment #2: Type: text/html, Size: 2639 bytes --]

Re: [Qemu-devel] [PATCH trivial] Fix comment typos in hw/armv7m.c

[Matthew Fernandez]

[-- Attachment #1: Type: text/plain, Size: 1515 bytes --]

On 23 June 2011 20:22, Andreas Färber <andreas.faerber@web.de> wrote:

> Am 23.06.2011 um 02:59 schrieb Matthew Fernandez:
>
>
>  Fix a couple of typos in comments.
>>
>> Signed-off-by: Matthew Fernandez <matthew.fernandez@gmail.com>
>> ----
>> This patch doesn't touch any code and should (hopefully) not be
>> controversial. There doesn't seem to be a maintainer for this file,
>> but changes are trivial.
>>
>>
>> diff --git a/hw/armv7m.c b/hw/armv7m.c
>> index 72d010a..83f3393 100644
>> --- a/hw/armv7m.c
>> +++ b/hw/armv7m.c
>> @@ -4,7 +4,7 @@
>>  * Copyright (c) 2006-2007 CodeSourcery.
>>  * Written by Paul Brook
>>  *
>> - * This code is licenced under the GPL.
>> + * This code is licensed under the GPL.
>>
>
> Nack. Licence is British English, license American English. It's not wrong.

Licence is the noun in British English, while license in the noun in
American English. License is the correct verb in both. Nevertheless, I don't
think this is worth debating. If there's dissent I'm happy to drop the first
part of the patch.

>
>
>   */
>>
>> #include "sysbus.h"
>> @@ -14,7 +14,7 @@
>>
>> /* Bitbanded IO.  Each word corresponds to a single bit.  */
>>
>> -/* Get the byte address of the real memory for a bitband acess.  */
>> +/* Get the byte address of the real memory for a bitband access.  */
>>
>
> This one's okay.
>
> Andreas
>
>
>  static inline uint32_t bitband_addr(void * opaque, uint32_t addr)
>> {
>>    uint32_t res;
>>
>>
>

[-- Attachment #2: Type: text/html, Size: 2639 bytes --]

Re: [Qemu-trivial] [Qemu-devel] [PATCH trivial] Fix comment typos in hw/armv7m.c

[Andreas Färber]

Am 23.06.2011 um 12:35 schrieb Matthew Fernandez:

> On 23 June 2011 20:22, Andreas Färber <andreas.faerber@web.de> wrote:
>> Am 23.06.2011 um 02:59 schrieb Matthew Fernandez:
>>>
>>>
>>> Fix a couple of typos in comments.
>>>
>>> Signed-off-by: Matthew Fernandez <matthew.fernandez@gmail.com>
>>> ----
>>> This patch doesn't touch any code and should (hopefully) not be
>>> controversial. There doesn't seem to be a maintainer for this file,
>>> but changes are trivial.
>>>
>>>
>>> diff --git a/hw/armv7m.c b/hw/armv7m.c
>>> index 72d010a..83f3393 100644
>>> --- a/hw/armv7m.c
>>> +++ b/hw/armv7m.c
>>> @@ -4,7 +4,7 @@
>>>  * Copyright (c) 2006-2007 CodeSourcery.
>>>  * Written by Paul Brook
>>>  *
>>> - * This code is licenced under the GPL.
>>> + * This code is licensed under the GPL.
>>>
>>
>> Nack. Licence is British English, license American English. It's  
>> not wrong.
> Licence is the noun in British English, while license in the noun in  
> American English. License is the correct verb in both.

Ah, you seem right.

> Nevertheless, I don't think this is worth debating. If there's  
> dissent I'm happy to drop the first part of the patch.

I would still suggest to separate the two issues, as Stefan W. has  
done before - one patch for all "acess" -> "access", and one for all  
"licenced" -> "licensed", rather than file-based changes. That reduces  
list traffic for such cosmetic issues.

It might be worth thinking about integrating the top 10 typos into  
checkpatch.pl.

Andreas

Re: [Qemu-devel] [PATCH trivial] Fix comment typos in hw/armv7m.c

[Andreas Färber]

Am 23.06.2011 um 12:35 schrieb Matthew Fernandez:

> On 23 June 2011 20:22, Andreas Färber <andreas.faerber@web.de> wrote:
>> Am 23.06.2011 um 02:59 schrieb Matthew Fernandez:
>>>
>>>
>>> Fix a couple of typos in comments.
>>>
>>> Signed-off-by: Matthew Fernandez <matthew.fernandez@gmail.com>
>>> ----
>>> This patch doesn't touch any code and should (hopefully) not be
>>> controversial. There doesn't seem to be a maintainer for this file,
>>> but changes are trivial.
>>>
>>>
>>> diff --git a/hw/armv7m.c b/hw/armv7m.c
>>> index 72d010a..83f3393 100644
>>> --- a/hw/armv7m.c
>>> +++ b/hw/armv7m.c
>>> @@ -4,7 +4,7 @@
>>>  * Copyright (c) 2006-2007 CodeSourcery.
>>>  * Written by Paul Brook
>>>  *
>>> - * This code is licenced under the GPL.
>>> + * This code is licensed under the GPL.
>>>
>>
>> Nack. Licence is British English, license American English. It's  
>> not wrong.
> Licence is the noun in British English, while license in the noun in  
> American English. License is the correct verb in both.

Ah, you seem right.

> Nevertheless, I don't think this is worth debating. If there's  
> dissent I'm happy to drop the first part of the patch.

I would still suggest to separate the two issues, as Stefan W. has  
done before - one patch for all "acess" -> "access", and one for all  
"licenced" -> "licensed", rather than file-based changes. That reduces  
list traffic for such cosmetic issues.

It might be worth thinking about integrating the top 10 typos into  
checkpatch.pl.

Andreas

Re: [Qemu-trivial] [Qemu-devel] [PATCH trivial] Fix comment typos in hw/armv7m.c

[Stefan Hajnoczi]

On Thu, Jun 23, 2011 at 10:59:26AM +1000, Matthew Fernandez wrote:
> Fix a couple of typos in comments.
> 
> Signed-off-by: Matthew Fernandez <matthew.fernandez@gmail.com>
> ----
> This patch doesn't touch any code and should (hopefully) not be
> controversial. There doesn't seem to be a maintainer for this file,
> but changes are trivial.
> 

Thanks, applied to the trivial patches tree:
http://repo.or.cz/w/qemu/stefanha.git/shortlog/refs/heads/trivial-patches

Stefan

Re: [Qemu-devel] [PATCH trivial] Fix comment typos in hw/armv7m.c

[Stefan Hajnoczi]

On Thu, Jun 23, 2011 at 10:59:26AM +1000, Matthew Fernandez wrote:
> Fix a couple of typos in comments.
> 
> Signed-off-by: Matthew Fernandez <matthew.fernandez@gmail.com>
> ----
> This patch doesn't touch any code and should (hopefully) not be
> controversial. There doesn't seem to be a maintainer for this file,
> but changes are trivial.
> 

Thanks, applied to the trivial patches tree:
http://repo.or.cz/w/qemu/stefanha.git/shortlog/refs/heads/trivial-patches

Stefan